feat: add metric

Author: whybeyoung

pyWrapper.cpp

@@ -11,14 +11,15 @@ const char *wrapperFileClass = "wrapper.class";
 const char *WrapperFile = "wrapper";
 const char *WrapperClass = "Wrapper";
 const char *PythonSo = "libpython3.so";
+wrapperMeterCustom g_metric_cb;
 
 std::mutex RECORD_MUTEX;
 std::map <std::string, std::string> SID_RECORD;
 std::map <std::string, wrapperCallback> SID_CB;
 std::map<std::string, const char *> SID_USRTAG;
 
 PYBIND11_EMBEDDED_MODULE(aiges_embed, module) {
-    module.def("callback_metric", &PyWrapper::callbackMetric, py::return_value_policy::automatic_reference);
+    module.def("callback_metric", &callbackMetric, py::return_value_policy::automatic_reference);
     module.def("callback", &callBack, py::return_value_policy::automatic_reference);
     py::class_<ResponseData> responseData(module, "ResponseData");
     responseData.def(py::init<>())
@@ -246,7 +247,7 @@ int PyWrapper::wrapperOnceExec(const char *usrTag, std::map <std::string, std::s
 
         py::gil_scoped_acquire acquire;
         // 执行python exec 推理
-        py::object r = _wrapperOnceExec(params, reqData);
+        py::object r = _wrapperOnceExec(params, reqData, usrTag);
         // 此段根据python的返回 ，回写 respData
         Response *resp;
         spdlog::debug("start cast python resp to c++ object, thread_id: {}, sid: {}", gettid(), sid);
@@ -370,7 +371,7 @@ std::string PyWrapper::wrapperError(int err) {
 
 int PyWrapper::wrapperSetCtrl(CtrlType type, wrapperMeterCustom mc) {
     if (type == CTMeterCustom) {
-        metric_cb = mc;
+        g_metric_cb = mc;
     }
     return 0;
 }
@@ -544,8 +545,9 @@ int PyWrapper::wrapperTest() {
 
 }
 
-int PyWrapper::callbackMetric(const void *usrTag, const char *meterKey, int count) {
-    return metric_cb(usrTag, meterKey, count);
+int callbackMetric(const char *usrTag, const char *meterKey, int count) {
+    printf("%s, %s, %d\n", usrTag, meterKey, count);
+    return g_metric_cb(usrTag, meterKey, count);
 }
 
 int callBack(Response *resp, std::string sid) {

pyWrapper.h

@@ -145,8 +145,6 @@ class PyWrapper {
     int wrapperExecFree(const char *usrTag);
 
     int wrapperTest();
-    int callbackMetric(const void *usrTag, const char *meterKey, int count);
-
 
     void setCallBack(wrapperCallback cb);
 
@@ -180,6 +178,7 @@ void DelHandleSid(char *handle);
 
 int callBack(Response *respData, std::string);
 
+int callbackMetric(const char *usrTag, const char *meterKey, int count);
 
 void SetSidCallBack(wrapperCallback cb, std::string sid);
 

wrapper.cpp

@@ -17,6 +17,8 @@ py::scoped_interpreter python;  // 全局解释器
 py::gil_scoped_release release; // 主线程中先释放release锁
 // 全局pywrapper类实例
 PyWrapper *pyWrapper;
+wrapperMeterCustom global_metric_cb;
+
 //
 
 //const char *logDir = "./log";
@@ -105,6 +107,10 @@ int WrapperAPI wrapperInit(pConfig cfg) {
 
     setLog(loglvl);
     printf("WrapperInit: 当前线程ID: %d \n", gettid());
+    if (global_metric_cb != NULL) {
+        pyWrapper->wrapperSetCtrl(CTMeterCustom, global_metric_cb);
+    }
+
     ret = pyWrapper->wrapperInit(config);
     return ret;
 }
@@ -316,10 +322,12 @@ int WrapperAPI wrapperSetCtrl(CtrlType type, void *func) {
     if (type == CTMeterCustom) {
         if (func == NULL) {
             printf("calculate function is null\n");
+            return 0;
         }
+        global_metric_cb = (wrapperMeterCustom) func;
         // 这里实际是往 python注册 wrapperMeterCustom 函数指针
-        int ret = pyWrapper->wrapperSetCtrl(type, (wrapperMeterCustom) func);
-        return ret;
+        //int ret = pyWrapper->wrapperSetCtrl(type, (wrapperMeterCustom*) func);
+        return 0;
     }
     return 0;
 }
@@ -418,4 +426,4 @@ wrapperExecAsync(const char *usrTag, pParamList params, pDataList reqData, wrapp
     return ret;
 }
 
-const char *WrapperAPI wrapperDebugInfo(const void *handle) { return NULL; }
+const char *WrapperAPI wrapperDebugInfo(const void *handle) { return NULL; }