Merge branch 'rel' into 'add_global_metrics_table'

# Conflicts:
#   shaping/src/shaper.cpp

1 files changed, 11 insertions, 21 deletions

diff --git a/shaping/test/stub.cpp b/shaping/test/stub.cpp
index c04ee13..fc2a53a 100644
--- a/shaping/test/stub.cpp
+++ b/shaping/test/stub.cpp
@@ -14,6 +14,7 @@
 #include <assert.h>
 #include <pthread.h>
 #include "stub.h"
+#include "shaper_maat.h"
 
 using namespace std;
 
@@ -22,27 +23,6 @@ using namespace std;
 #define MAX_STUB_RULE_NUM 8
 #define MAX_STUB_PROFILE_NUM 8
 
-struct shaping_rule {
-    int vsys_id;
-    int id;
-    int priority;
-    int primary_pf_id;
-    int borrow_pf_id_array[MAX_STUB_PROFILE_NUM];
-    int borrow_pf_num;
-    int fair_factor;
-    int ref_cnt;
-};
-
-struct shaping_profile {
-    int id;
-    int split;
-    int host_fairness;
-    int in_limit_bandwidth;
-    int out_limit_bandwidth;
-    int valid;
-    int ref_cnt;
-};
-
 struct stub_matched_rules {
     struct shaping_rule rules[MAX_STUB_RULE_NUM];
     int rule_num;
@@ -421,6 +401,16 @@ void swarmkv_tconsume(struct swarmkv * db, const char * key, size_t keylen, long
     return;
 }
 
+void swarmkv_ftconsume(struct swarmkv * db, const char * key, size_t keylen, const char * member, size_t member_len, long long weight, long long tokens, swarmkv_on_reply_callback_t *cb, void *cb_arg)
+{
+    return;
+}
+
+void swarmkv_btconsume(struct swarmkv * db, const char * key, size_t keylen, const char * member, size_t member_len, long long tokens, swarmkv_on_reply_callback_t *cb, void *cb_arg)
+{
+    return;
+}
+
 void swarmkv_close(struct swarmkv * db)
 {
     if (db) {