summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliuchang <[email protected]>2023-05-12 02:01:55 +0000
committerliuchang <[email protected]>2023-05-12 02:01:55 +0000
commit8ec2423091896305fddeb591ab6115ab7381097d (patch)
treedc9834d5b864e1286a8a118373bbd0313fd8556b
parentc90d40342f93f9a1770ded16bc2c1d4167baf20d (diff)
1. add debuginfo
2. set ctrlbuf when send log
-rw-r--r--shaping/src/shaper_session.cpp5
-rw-r--r--shaping/test/stub.cpp5
2 files changed, 9 insertions, 1 deletions
diff --git a/shaping/src/shaper_session.cpp b/shaping/src/shaper_session.cpp
index 72bd768..33ee9f3 100644
--- a/shaping/src/shaper_session.cpp
+++ b/shaping/src/shaper_session.cpp
@@ -58,7 +58,7 @@ void shaper_session_log_prepare(struct shaping_flow *sf, char **mpack_data, size
mpack_write_cstr(&writer, "method");
mpack_write_cstr(&writer, "log_update");
- LOG_DEBUG("%s: shaper send log to sapp for session %s", LOG_TAG_SHAPING, addr_tuple4_to_str(&sf->tuple4));
+ LOG_DEBUG("%s: shaper prepare log to sapp for session %s, id %lu", LOG_TAG_SHAPING, addr_tuple4_to_str(&sf->tuple4), sf->ctrl_meta.session_id);
//params
mpack_write_cstr(&writer, "params");
mpack_build_map(&writer);
@@ -89,6 +89,8 @@ void shaper_session_log_prepare(struct shaping_flow *sf, char **mpack_data, size
mpack_complete_map(&writer);//end build map at the beginning
mpack_writer_destroy(&writer);
+
+ LOG_DEBUG("%s: log length is %lu", LOG_TAG_SHAPING, *mpack_size);
return;
}
@@ -106,6 +108,7 @@ static void shaper_session_log_send(struct shaping_thread_ctx *ctx, struct shapi
struct sids sids;
marsio_buff_malloc_global(ctx->marsio_info->instance, &tx_buff, 1, 0, ctx->thread_index);
+ marsio_buff_set_ctrlbuf(tx_buff);
char *dst = marsio_buff_append(tx_buff, pkt_header_len + mpack_size);
memcpy(dst, pkt_header_data, pkt_header_len);
memcpy(dst + pkt_header_len, mpack_data, mpack_size);
diff --git a/shaping/test/stub.cpp b/shaping/test/stub.cpp
index b2d8cc9..bd3c796 100644
--- a/shaping/test/stub.cpp
+++ b/shaping/test/stub.cpp
@@ -562,6 +562,11 @@ int marsio_send_burst(struct mr_sendpath * sendpath, queue_id_t qid, marsio_buff
}
+void marsio_buff_set_ctrlbuf(marsio_buff_t * m)
+{
+ return;
+}
+
void marsio_buff_free(struct mr_instance * instance, marsio_buff_t * marsio_buff[], unsigned int nr_mbufs, int socket_id, int thread_id)
{
assert(nr_mbufs == 1);