Minor signature change

Author: renukamanavalan

common/events.cpp

@@ -419,24 +419,17 @@ events_deinit_subscriber(event_handle_t handle)
 }
 
 
-
-int
-event_receive(event_handle_t handle, string &key,
-        event_params_t &params, int &missed_cnt)
-{
-    if ((handle == s_subscriber) && (s_subscriber != NULL)) {
-        return s_subscriber->event_receive(key, params, missed_cnt);
-    }
-    return -1;
-}
-
-
 event_receive_op_t
-event_receive_as_struct(event_handle_t handle)
+event_receive(event_handle_t handle)
 {
     event_receive_op_t op;
 
-    op.rc = event_receive(handle, op.key, op.params, op.missed_cnt);
+    if ((handle == s_subscriber) && (s_subscriber != NULL)) {
+        op.rc = s_subscriber->event_receive(op.key, op.params, op.missed_cnt);
+    }
+    else {
+        op.rc = -1;
+    }
     return op;
 }
 
@@ -538,25 +531,24 @@ int
 event_receive_wrap(void *handle, char *event_str,
         int event_str_sz, char *missed_cnt_str, int missed_cnt_str_sz)
 {
-    string key;
-    event_params_t params;
-    int missed_cnt = 0;
+    event_receive_op_t evt;
+    int rc = 0;
 
     SWSS_LOG_DEBUG("events_receive_wrap h=%p event-sz=%d missed-sz=%d\n",
             handle, event_str_sz, missed_cnt_str_sz);
 
-    int rc = event_receive(handle, key, params, missed_cnt);
+    evt = event_receive(handle);
 
-    if (rc == 0) {
+    if (evt.rc == 0) {
         nlohmann::json res = nlohmann::json::object();
 
         {
             nlohmann::json params_data = nlohmann::json::object();
 
-            for (event_params_t::const_iterator itc = params.begin(); itc != params.end(); ++itc) {
+            for (event_params_t::const_iterator itc = evt.params.begin(); itc != evt.params.end(); ++itc) {
                 params_data[itc->first] = itc->second;
             }
-            res[key] = params_data;
+            res[evt.key] = params_data;
         }
         string json_str(res.dump());
         rc = snprintf(event_str, event_str_sz, "%s", json_str.c_str());
@@ -566,17 +558,20 @@ event_receive_wrap(void *handle, char *event_str,
             event_str[event_str_sz-1] = 0;
         }
 
-        int rc_missed = snprintf(missed_cnt_str, missed_cnt_str_sz, "%d", missed_cnt);
+        int rc_missed = snprintf(missed_cnt_str, missed_cnt_str_sz, "%d", evt.missed_cnt);
         if (rc_missed >= missed_cnt_str_sz) {
             SWSS_LOG_ERROR("missed cnt (%d) buffer.need=%d given=%d",
-                    missed_cnt, rc_missed, missed_cnt_str_sz);
+                    evt.missed_cnt, rc_missed, missed_cnt_str_sz);
             missed_cnt_str[missed_cnt_str_sz-1] = 0;
         }
     }
-    else if (rc > 0) {
+    else if (evt.rc > 0) {
         // timoeut
         rc = 0;
     }
+    else {
+        rc = evt.rc;
+    }
 
     SWSS_LOG_DEBUG("events_receive_wrap rc=%d event_str=%s missed=%s\n",
             rc, event_str, missed_cnt_str);

common/events.h

@@ -151,6 +151,13 @@ event_handle_t events_init_subscriber(bool use_cache=false,
 void events_deinit_subscriber(event_handle_t handle);
 
 
+typedef struct {
+    int rc;                 /* Return value of event_receive */
+    std::string key;        /* key */
+    event_params_t params;  /* Params received */
+    int missed_cnt;         /* missed count */
+} event_receive_op_t;
+
 /*
  * Receive an event.
  * A blocking call unless the subscriber is created with a timeout.
@@ -193,36 +200,7 @@ void events_deinit_subscriber(event_handle_t handle);
  *  < 0 - For all other failures
  *
  */
-int event_receive(event_handle_t handle, std::string &key,
-        event_params_t &params, int &missed_cnt);
-
-/*
- * event_receive_as_struct
- *
- * Returns o/p as structured.
- * This is handy for invocation via python.
- *
- * input:
- *  handle - As obtained from events_init_subscriber
- *
- * output:
- *  None
- *
- * Return:
- *  struct that gets return value and all o/p params of event_receive
- */
-typedef struct {
-    int rc;     /* Return value of event_receive */
-    /* o/p params from event receive */
-    std::string key;
-    event_params_t params;
-    int missed_cnt;
-} event_receive_op_t;
-
-event_receive_op_t event_receive_as_struct(event_handle_t handle);
+event_receive_op_t event_receive(event_handle_t handle);
 
-/* Non ZMQ Error codes */
-#define ERR_MESSAGE_INVALID -2
-#define ERR_OTHER -1
 
 #endif /* !_EVENTS_H */ 

common/events_common.h

@@ -18,11 +18,13 @@
 #include <boost/archive/text_oarchive.hpp>
 
 #include "logger.h"
-#include "events.h"
 
 using namespace std;
 using namespace chrono;
 
+#define ERR_MESSAGE_INVALID -2
+#define ERR_OTHER -1
+
 /*
  * Max count of possible concurrent event publishers
  * We maintain a cache of last seen sequence number per publisher.

common/events_wrap.h

@@ -106,26 +106,27 @@ void events_deinit_subscriber_wrap(void *handle);
  * Receive an event.
  *
  * input:
- *  args:
+ *  handle - Handle obtained from init subscriber
+ *  event_str:
  *      Buffer for receiving event formatted as below.
- *      '{ "key" : "<event's key as string>",
- *         "params": {
- *             <map of string:string params>
- *          },
- *          "missed_cnt": <missed count as int>
- *       }'
+ *      <publish_source + tag as key>: {
+ *              <params as dict>
+ *      }
  *      e.g: '{
- *          "key": "sonic-events-bgp:bgp-state":
- *          "params": {
+ *          "sonic-events-bgp:bgp-state": {
  *               "timestamp": "2022-08-17T02:39:21.286611Z",
  *               "ip": "100.126.188.90",
  *               "status": "down"
- *           },
- *          "missed_cnt": 0
+ *           }
  *       }'
- *  sz:
+ *  event_str_sz:
  *      Size of the buffer for receiving event.
  *
+ *  missed_cnt:
+ *      Buffer to receive missed count as int converted to string.
+ *
+ *  missed_cnt_sz:
+ *      Size of the missed_cnt buffer.
  *
  * Return:
  *  > 0 -- Implies received an event
@@ -135,6 +136,9 @@ void events_deinit_subscriber_wrap(void *handle);
 int event_receive_wrap(void *handle, char *event_str,
         int event_str_sz, char *missed_cnt, int missed_cnt_sz);
 
+/*
+ * Set SWSS log priority
+ */
 void swssSetLogPriority(int pri);
 
 #ifdef __cplusplus

common/logger.cpp

@@ -186,6 +186,8 @@ Logger& Logger::getInstance()
 void Logger::setMinPrio(Priority prio)
 {
     getInstance().m_minPrio = prio;
+    SWSS_LOG_ERROR("loglevel Set=%d", prio);
+
 }
 
 Logger::Priority Logger::getMinPrio()

pyext/swsscommon.i

@@ -218,6 +218,5 @@ T castSelectableObj(swss::Selectable *temp)
 %include "dbinterface.h"
 %include "logger.h"
 %include "events.h"
-%ignore event_receive(event_handle_t, std::string &, event_params_t &, int &);
 
 %include "status_code_util.h"

tests/events_ut.cpp

@@ -540,24 +540,23 @@ TEST(events, subscribe)
     pub_events(index_subs, cnt_subs);
 
     for(i=0; true; ++i) {
-        string key, exp_key;
-        event_params_t params;
-        int missed = -1;
+        string exp_key;
+        event_receive_op_t evt;
 
-        int rc = event_receive(hsub, key, params, missed);
+        evt = event_receive(hsub);
 
-        if (rc != 0) {
-            EXPECT_EQ(EAGAIN, rc);
+        if (evt.rc != 0) {
+            EXPECT_EQ(EAGAIN, evt.rc);
             break;
         }
 
-        EXPECT_EQ(ldata[i].params, params);
+        EXPECT_EQ(ldata[i].params, evt.params);
 
         exp_key = ldata[i].source + ":" + ldata[i].tag;
 
-        EXPECT_EQ(exp_key, key);
+        EXPECT_EQ(exp_key, evt.key);
 
-        EXPECT_EQ(ldata[i].missed_cnt, missed);
+        EXPECT_EQ(ldata[i].missed_cnt, evt.missed_cnt);
     }
 
     EXPECT_EQ(i, (int)ARRAY_SIZE(ldata));