summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author刘畅 <[email protected]>2023-07-12 08:45:39 +0000
committer刘畅 <[email protected]>2023-07-12 08:45:39 +0000
commit6bef4d3eafed16f99ad898a692469d06e815fce9 (patch)
tree4a2bb31ff18abfa2e09dc8b4b318b9106df5f7a6
parented469938b4691357242cca0808c597b5cf993924 (diff)
parent09c098dab7e6dc609a7c75958af6be1b32a26105 (diff)
Merge branch 'change_marsio_poll_wait_time' into 'rel'v1.2.8
change timeout of marsio_epoll_wait from 1ms to 1000ms See merge request tango/shaping-engine!37
-rw-r--r--shaping/src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/shaping/src/main.cpp b/shaping/src/main.cpp
index 66e9370..881476b 100644
--- a/shaping/src/main.cpp
+++ b/shaping/src/main.cpp
@@ -28,7 +28,7 @@ static void *shaper_thread_loop(void *data)
session_table_reset_with_callback(ctx->session_table, shaper_session_data_free_cb, ctx);
__atomic_fetch_and(&ctx->session_need_reset, 0, __ATOMIC_SEQ_CST);
}
- marsio_poll_wait(ctx->marsio_info->instance, &ctx->marsio_info->mr_dev, 1, ctx->thread_index, 1);
+ marsio_poll_wait(ctx->marsio_info->instance, &ctx->marsio_info->mr_dev, 1, ctx->thread_index, ctx->global_stat->output_interval_s * 1000);
}
return NULL;