Merge branch 'add_debug_when_send_log' into 'rel'v1.1.10

add debuginfo

See merge request tango/shaping-engine!16

2 files changed, 14 insertions, 0 deletions

diff --git a/shaping/src/shaper_session.cpp b/shaping/src/shaper_session.cpp
index ec7b9d0..33ee9f3 100644
--- a/shaping/src/shaper_session.cpp
+++ b/shaping/src/shaper_session.cpp
@@ -58,6 +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 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);
@@ -69,11 +70,16 @@ void shaper_session_log_prepare(struct shaping_flow *sf, char **mpack_data, size
         mpack_build_map(&writer);
         mpack_write_cstr(&writer, "rule_id");
         mpack_write_i64(&writer, rule_info->id);
+        LOG_DEBUG("%s: rule id %d", LOG_TAG_SHAPING, rule_info->id);
+
         mpack_write_cstr(&writer, "profile_ids");
         mpack_build_array(&writer);
         mpack_write_i64(&writer, rule_info->primary.id);
+        LOG_DEBUG("%s: primary_profile id %d", LOG_TAG_SHAPING, rule_info->primary.id);
+
         for (int j = 0; j < rule_info->borrowing_num; j++) {
             mpack_write_i64(&writer, rule_info->borrowing[j].id);
+            LOG_DEBUG("%s: borrow_profile id %d", LOG_TAG_SHAPING, rule_info->borrowing[j].id);
         }
         mpack_complete_array(&writer);//end build array for profile_ids
         mpack_complete_map(&writer);
@@ -83,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;
 }
 
@@ -100,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);