Minor signature update to adapt to SWIG generated python

Author: renukamanavalan

common/events.cpp

@@ -149,7 +149,7 @@ events_init_publisher(const string event_source)
 }
 
 void
-events_deinit_publisher(event_handle_t &handle)
+events_deinit_publisher(event_handle_t handle)
 {
     lst_publishers_t::iterator it;
 
@@ -160,8 +160,6 @@ events_deinit_publisher(event_handle_t &handle)
             break;
         }
     }
-    handle = NULL;
-
 }
 
 int
@@ -413,13 +411,12 @@ events_init_subscriber(bool use_cache, int recv_timeout,
 
 
 void
-events_deinit_subscriber(event_handle_t &handle)
+events_deinit_subscriber(event_handle_t handle)
 {
     if ((handle == s_subscriber) && (s_subscriber != NULL)) {
         delete s_subscriber;
         s_subscriber = NULL;
     }
-    handle = NULL;
 }
 
 
@@ -434,6 +431,16 @@ event_receive(event_handle_t handle, string &key,
     return -1;
 }
 
+
+event_receive_op_t
+event_receive_wrap(event_handle_t handle)
+{
+    event_receive_op_t op;
+
+    op.rc = event_receive(handle, op.key, op.params, op.missed_cnt);
+    return op;
+}
+
 int event_last_error()
 {
     return zerrno;

common/events.h

@@ -52,7 +52,7 @@ event_handle_t events_init_publisher(const std::string event_source);
  * Output: 
  *  Handle is nullified.
  */
-void events_deinit_publisher(event_handle_t &handle);
+void events_deinit_publisher(event_handle_t handle);
 
 
 /*
@@ -147,7 +147,7 @@ event_handle_t events_init_subscriber(bool use_cache=false,
  * Output: 
  *  Handle is nullified.
  */
-void events_deinit_subscriber(event_handle_t &handle);
+void events_deinit_subscriber(event_handle_t handle);
 
 
 /*
@@ -194,6 +194,31 @@ void events_deinit_subscriber(event_handle_t &handle);
 int event_receive(event_handle_t handle, std::string &key,
         event_params_t &params, int &missed_cnt);
 
+/*
+ * event_receive_wrap
+ *
+ * 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_wrap(event_handle_t handle);
+
 
 /*
  *  Get error code for last receive

common/events_common.h

@@ -96,9 +96,14 @@ string
 map_to_str(const Map &m)
 {
     stringstream _ss;
+    string sep;
+
     _ss << "{";
     for (const auto elem: m) {
-        _ss << "{" << elem.first << "," << elem.second.substr(0,10) << "}";
+        _ss << sep << "{" << elem.first << "," << elem.second.substr(0,10) << "}";
+        if (sep.empty()) {
+            sep = ", ";
+        }
     }
     _ss << "}";
     return _ss.str();

pyext/swsscommon.i

@@ -208,4 +208,6 @@ 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"