chore: rebase to master

Author: terry-xiaoyu

src/emqtt_bench.erl

@@ -96,7 +96,7 @@
          {nst_dets_file, undefined, "load-qst", string, "load quic session tickets from dets file"},
          %% == MQTT layer ==
          {username, $u, "username", string,
-          "username for connecting to server, support %i, %(i/2), %(rand(100)) variables"},
+          "username for connecting to server, support %i, %(rand(100)) variables"},
          {password, $P, "password", string,
           "password for connecting to server"},
          {keepalive, $k, "keepalive", {integer, 300},
@@ -198,6 +198,25 @@
 
 -define(CONN_OPTS, ?COMMON_OPTS).
 
+-define(COUNTER_NAMES,
+    [ publish_latency
+    , recv
+    , sub
+    , sub_fail
+    , pub
+    , pub_fail
+    , pub_overrun
+    , pub_succ
+    , connect_succ
+    , connect_fail
+    , connect_retried
+    , reconnect_succ
+    , unreachable
+    , connection_refused
+    , connection_timeout
+    , connection_idle
+    ]).
+
 -define(shared_padding_tab, emqtt_bench_shared_payload).
 -define(QoELog, qoe_dlog).
 -define(cnt_map, cnt_map).
@@ -966,18 +985,18 @@ eval_expr("rand(" ++ Str) ->
             Int = strip_last_char(Str),
             rand:uniform(list_to_integer(Int));
         _ -> Str
-    end.
+    end;
+eval_expr(Str) ->
+    throw({unsupported_expression, Str}).
 
 parse_expr("%i") ->
     erlang:get(conn_id);
-parse_expr("%(i-div-2)") ->
-    erlang:get(conn_id) div 2;
-parse_expr("%(" ++ Str) ->
+parse_expr("%(" ++ Str = Str0) ->
     case lists:last(Str) of
         $) ->
             eval_expr(strip_last_char(Str));
         _ ->
-            throw({invalid_expression, "%(" ++ Str})
+            Str0
     end;
 parse_expr(Str) ->
     Str.