commit c856de20b15e53bf7a2b351375bb4100f9600002
author Andrew Stitcher <astitcher@apache.org> Wed Apr 22 22:25:29 2020 -0400
committer Andrew Stitcher <astitcher@apache.org> Wed Apr 22 22:35:41 2020 -0400
tree d71f2289d5a83f54b3a9ccee1b16f85cecdfeebf
parent ae06b4180e924b392e1b816f97aada8591255b5a

PROTON-2196: Small proactor tidy ups

c/src/proactor/epoll.c

diff --git a/c/src/proactor/epoll.c b/c/src/proactor/epoll.c
index e68e7c8..9008489 100644
--- a/c/src/proactor/epoll.c
+++ b/c/src/proactor/epoll.c
@@ -675,13 +675,6 @@
   return pn_collector_peek(p->collector);
 }
 
-static pn_event_t *log_event(void* p, pn_event_t *e) {
-  if (e) {
-    PN_LOG_DEFAULT(PN_SUBSYSTEM_EVENT, PN_LEVEL_DEBUG, "[%p]:(%s)", (void*)p, pn_event_type_name(pn_event_type(e)));
-  }
-  return e;
-}
-
 static void psocket_error_str(psocket_t *ps, const char *msg, const char* what) {
   if (!ps->listener) {
     pn_connection_driver_t *driver = &psocket_pconnection(ps)->driver;
@@ -1746,7 +1739,7 @@
   if (e && pn_event_type(e) == PN_LISTENER_CLOSE)
     l->close_dispatched = true;
   unlock(&l->context.mutex);
-  return log_event(l, e);
+  return pni_log_event(l, e);
 }
 
 static void listener_done(pn_listener_t *l) {
@@ -1974,7 +1967,7 @@
   if (e && pn_event_type(e) == PN_PROACTOR_TIMEOUT)
     p->timeout_processed = true;
   unlock(&p->context.mutex);
-  return log_event(p, e);
+  return pni_log_event(p, e);
 }
 
 static pn_event_batch_t *proactor_process(pn_proactor_t *p, pn_event_type_t event) {

c/src/proactor/libuv.c

diff --git a/c/src/proactor/libuv.c b/c/src/proactor/libuv.c
index fb27cd7..ef2cd7c 100644
--- a/c/src/proactor/libuv.c
+++ b/c/src/proactor/libuv.c
@@ -823,25 +823,18 @@
   return &p->batch;
 }
 
-static pn_event_t *log_event(void* p, pn_event_t *e) {
-  if (e) {
-    PN_LOG_DEFAULT(PN_SUBSYSTEM_EVENT, PN_LEVEL_DEBUG, "[%p]:(%s)", (void*)p, pn_event_type_name(pn_event_type(e)));
-  }
-  return e;
-}
-
 static pn_event_t *listener_batch_next(pn_event_batch_t *batch) {
   pn_listener_t *l = batch_listener(batch);
   uv_mutex_lock(&l->lock);
   pn_event_t *e = pn_collector_next(l->collector);
   uv_mutex_unlock(&l->lock);
-  return log_event(l, e);
+  return pni_log_event(l, e);
 }
 
 static pn_event_t *proactor_batch_next(pn_event_batch_t *batch) {
   pn_proactor_t *p = batch_proactor(batch);
   assert(p->batch_working);
-  return log_event(p, pn_collector_next(p->collector));
+  return pni_log_event(p, pn_collector_next(p->collector));
 }
 
 static pn_event_t *pconnection_batch_next(pn_event_batch_t *batch) {

c/src/proactor/proactor-internal.h

diff --git a/c/src/proactor/proactor-internal.h b/c/src/proactor/proactor-internal.h
index 88e61c0..afa615a 100644
--- a/c/src/proactor/proactor-internal.h
+++ b/c/src/proactor/proactor-internal.h
@@ -25,6 +25,8 @@
 #include <proton/import_export.h>
 #include <proton/type_compat.h>
 
+#include "core/logger_private.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -60,6 +62,13 @@
   pn_event_t *(*next_event)(pn_event_batch_t *batch);
 };
 
+static inline pn_event_t *pni_log_event(void* p, pn_event_t *e) {
+  if (e) {
+    PN_LOG_DEFAULT(PN_SUBSYSTEM_EVENT, PN_LEVEL_DEBUG, "[%p]:(%s)", (void*)p, pn_event_type_name(pn_event_type(e)));
+  }
+  return e;
+}
+
 #ifdef __cplusplus
 }
 #endif

c/src/proactor/win_iocp.c

diff --git a/c/src/proactor/win_iocp.c b/c/src/proactor/win_iocp.c
index 07a3a78..0c738f4 100644
--- a/c/src/proactor/win_iocp.c
+++ b/c/src/proactor/win_iocp.c
@@ -2017,13 +2017,6 @@
   return pn_collector_peek(p->collector);
 }
 
-static pn_event_t *log_event(void* p, pn_event_t *e) {
-  if (e) {
-    PN_LOG_DEFAULT(PN_SUBSYSTEM_EVENT, PN_LEVEL_DEBUG, "[%p]:(%s)", (void*)p, pn_event_type_name(pn_event_type(e)));
-  }
-  return e;
-}
-
 static void psocket_error_str(psocket_t *ps, const char *msg, const char* what) {
   if (ps->is_reaper)
     return;