Merge branch 'shaping_fieldstat3' into 'rel'v1.1.0

Shaping fieldstat3

See merge request liuchang/shaping-engine!1

1 files changed, 7 insertions, 2 deletions

diff --git a/shaping/test/stub.cpp b/shaping/test/stub.cpp
index 2bf4a8f..b49bafd 100644
--- a/shaping/test/stub.cpp
+++ b/shaping/test/stub.cpp
@@ -158,9 +158,9 @@ struct stub_pkt_queue* stub_get_tx_queue()
     return &tx_queue;
 }
 
-void stub_curr_time_inc()
+void stub_curr_time_inc(unsigned long long time_ns)
 {
-    curr_time += 1000;
+    curr_time += time_ns;
 
     return;
 }
@@ -272,6 +272,11 @@ int swarmkv_options_set_log_path(struct swarmkv_options *opts, const char *logpa
     return 0;
 }
 
+int swarmkv_options_set_log_level(struct swarmkv_options *opts, int loglevel)
+{
+    return 0;
+}
+
 void swarmkv_tconsume(struct swarmkv * db, const char * key, size_t keylen, long long tokens, swarmkv_on_reply_callback_t *cb, void *cb_arg)
 {
     int actual_tokens;