Rename the current opal_event_base to opal_sync_event_base in preparation for adding an async progress thread to opal. No functional changes made here - just a simple rename.

Ralph Castain · jsquyres · commit 48c22c48a243 · 2015-10-22T11:45:47.000-07:00
(cherry picked from commit open-mpi/ompi@683efcb)
diff --git a/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c b/ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c
@@ -8,6 +8,7 @@
  * Copyright (c) 2010-2012 Oracle and/or its affiliates.  All rights reserved.
  * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2015      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -32,7 +33,6 @@
 
 #include "opal/util/opal_environ.h"
 #include "ompi/mca/mca.h"
-#include "opal/mca/base/base.h"
 #include "opal/mca/pmix/pmix.h"
 
 #include "ompi/request/request.h"
@@ -4440,7 +4440,7 @@ static int ft_event_exchange_bookmarks(void)
     /* Wait for all bookmarks to arrive */
     START_TIMER(CRCP_TIMER_CKPT_EX_WAIT);
     while( total_recv_bookmarks > 0 ) {
-        opal_event_loop(opal_event_base, OPAL_EVLOOP_NONBLOCK);
+        opal_event_loop(opal_sync_event_base, OPAL_EVLOOP_NONBLOCK);
     }
     total_recv_bookmarks = 0;
     END_TIMER(CRCP_TIMER_CKPT_EX_WAIT);
@@ -5227,7 +5227,7 @@ static int wait_quiesce_drain_ack(void)
             }
         }
 
-        opal_event_loop(opal_event_base, OPAL_EVLOOP_NONBLOCK);
+        opal_event_loop(opal_sync_event_base, OPAL_EVLOOP_NONBLOCK);
     }
 
     /* Clear the ack queue if it isn't already clear (it should already be) */
diff --git a/opal/mca/btl/openib/btl_openib_fd.c b/opal/mca/btl/openib/btl_openib_fd.c
@@ -175,7 +175,7 @@ static int service_pipe_cmd_add_fd(bool use_libevent, cmd_t *cmd)
     if (use_libevent) {
         /* Make an event for this fd */
         ri->ri_event_used = true;
-        opal_event_set(opal_event_base, &ri->ri_event, ri->ri_fd,
+        opal_event_set(opal_sync_event_base, &ri->ri_event, ri->ri_fd,
                        ri->ri_flags | OPAL_EV_PERSIST, service_fd_callback,
                        ri);
         opal_event_add(&ri->ri_event, 0);
@@ -501,7 +501,7 @@ int opal_btl_openib_fd_init(void)
 
         /* Create a libevent event that is used in the main thread
            to watch its pipe */
-        opal_event_set(opal_event_base, &main_thread_event, pipe_to_main_thread[0],
+        opal_event_set(opal_sync_event_base, &main_thread_event, pipe_to_main_thread[0],
                        OPAL_EV_READ | OPAL_EV_PERSIST,
                        main_thread_event_callback, NULL);
         opal_event_add(&main_thread_event, 0);
diff --git a/opal/mca/btl/openib/connect/btl_openib_connect_udcm.c b/opal/mca/btl/openib/connect/btl_openib_connect_udcm.c
@@ -2207,7 +2207,7 @@ static void udcm_sent_message_constructor (udcm_message_sent_t *message)
 {
     memset ((char *)message + sizeof (message->super), 0,
             sizeof (*message) - sizeof (message->super));
-    opal_event_evtimer_set(opal_event_base, &message->event, udcm_send_timeout, message);
+    opal_event_evtimer_set(opal_sync_event_base, &message->event, udcm_send_timeout, message);
 }
 
 static void udcm_sent_message_destructor (udcm_message_sent_t *message)
diff --git a/opal/mca/btl/tcp/btl_tcp_component.c b/opal/mca/btl/tcp/btl_tcp_component.c
@@ -819,7 +819,7 @@ static int mca_btl_tcp_component_create_listen(uint16_t af_family)
     /* register listen port */
 #if OPAL_ENABLE_IPV6
     if (AF_INET6 == af_family) {
-        opal_event_set(opal_event_base, &mca_btl_tcp_component.tcp6_recv_event,
+        opal_event_set(opal_sync_event_base, &mca_btl_tcp_component.tcp6_recv_event,
                         mca_btl_tcp_component.tcp6_listen_sd,
                         OPAL_EV_READ|OPAL_EV_PERSIST,
                         mca_btl_tcp_component_accept_handler,
@@ -828,7 +828,7 @@ static int mca_btl_tcp_component_create_listen(uint16_t af_family)
     } else
 #endif
     {
-        opal_event_set(opal_event_base, &mca_btl_tcp_component.tcp_recv_event,
+        opal_event_set(opal_sync_event_base, &mca_btl_tcp_component.tcp_recv_event,
                         mca_btl_tcp_component.tcp_listen_sd,
                         OPAL_EV_READ|OPAL_EV_PERSIST,
                         mca_btl_tcp_component_accept_handler,
@@ -1050,7 +1050,7 @@ static void mca_btl_tcp_component_accept_handler( int incoming_sd,
 
         /* wait for receipt of peers process identifier to complete this connection */
         event = OBJ_NEW(mca_btl_tcp_event_t);
-        opal_event_set(opal_event_base, &event->event, sd, OPAL_EV_READ, mca_btl_tcp_component_recv_handler, event);
+        opal_event_set(opal_sync_event_base, &event->event, sd, OPAL_EV_READ, mca_btl_tcp_component_recv_handler, event);
         opal_event_add(&event->event, 0);
     }
 }
diff --git a/opal/mca/btl/tcp/btl_tcp_endpoint.c b/opal/mca/btl/tcp/btl_tcp_endpoint.c
@@ -309,7 +309,7 @@ static inline void mca_btl_tcp_endpoint_event_init(mca_btl_base_endpoint_t* btl_
     btl_endpoint->endpoint_cache_pos = btl_endpoint->endpoint_cache;
 #endif  /* MCA_BTL_TCP_ENDPOINT_CACHE */
 
-    opal_event_set(opal_event_base, &btl_endpoint->endpoint_recv_event,
+    opal_event_set(opal_sync_event_base, &btl_endpoint->endpoint_recv_event,
                     btl_endpoint->endpoint_sd,
                     OPAL_EV_READ|OPAL_EV_PERSIST,
                     mca_btl_tcp_endpoint_recv_handler,
@@ -320,7 +320,7 @@ static inline void mca_btl_tcp_endpoint_event_init(mca_btl_base_endpoint_t* btl_
      * will be fired only once, and when the endpoint is marked as
      * CONNECTED the event should be recreated with the correct flags.
      */
-    opal_event_set(opal_event_base, &btl_endpoint->endpoint_send_event,
+    opal_event_set(opal_sync_event_base, &btl_endpoint->endpoint_send_event,
                     btl_endpoint->endpoint_sd,
                     OPAL_EV_WRITE,
                     mca_btl_tcp_endpoint_send_handler,
@@ -509,7 +509,7 @@ void mca_btl_tcp_endpoint_accept(mca_btl_base_endpoint_t* btl_endpoint,
     assert(btl_endpoint->endpoint_sd_next == -1);
     btl_endpoint->endpoint_sd_next = sd;
 
-    opal_event_evtimer_set(opal_event_base, &btl_endpoint->endpoint_accept_event,
+    opal_event_evtimer_set(opal_sync_event_base, &btl_endpoint->endpoint_accept_event,
                            mca_btl_tcp_endpoint_complete_accept, btl_endpoint);
     opal_event_add(&btl_endpoint->endpoint_accept_event, &now);
 }
@@ -570,7 +570,7 @@ static void mca_btl_tcp_endpoint_connected(mca_btl_base_endpoint_t* btl_endpoint
     MCA_BTL_TCP_ENDPOINT_DUMP(1, btl_endpoint, true, "READY [endpoint_connected]");
 
     /* Create the send event in a persistent manner. */
-    opal_event_set(opal_event_base, &btl_endpoint->endpoint_send_event,
+    opal_event_set(opal_sync_event_base, &btl_endpoint->endpoint_send_event,
                     btl_endpoint->endpoint_sd,
                     OPAL_EV_WRITE | OPAL_EV_PERSIST,
                     mca_btl_tcp_endpoint_send_handler,
diff --git a/opal/mca/btl/usnic/btl_usnic_component.c b/opal/mca/btl/usnic/btl_usnic_component.c
@@ -1018,7 +1018,7 @@ static mca_btl_base_module_t** usnic_component_init(int* num_btl_modules,
     }
 
     /* start timer to guarantee synthetic clock advances */
-    opal_event_set(opal_event_base, &usnic_clock_timer_event,
+    opal_event_set(opal_sync_event_base, &usnic_clock_timer_event,
                    -1, 0, usnic_clock_callback,
                    &usnic_clock_timeout);
     usnic_clock_timer_event_set = true;
diff --git a/opal/mca/btl/usnic/btl_usnic_endpoint.c b/opal/mca/btl/usnic/btl_usnic_endpoint.c
@@ -86,6 +86,7 @@ static void endpoint_construct(mca_btl_base_endpoint_t* endpoint)
     OBJ_CONSTRUCT(&endpoint->endpoint_hotel, opal_hotel_t);
     opal_hotel_init(&endpoint->endpoint_hotel,
                     WINDOW_SIZE,
+                    opal_sync_event_base,
                     mca_btl_usnic_component.retrans_timeout,
                     0,
                     opal_btl_usnic_ack_timeout);
diff --git a/opal/mca/btl/usnic/btl_usnic_module.c b/opal/mca/btl/usnic/btl_usnic_module.c
@@ -2102,7 +2102,7 @@ static void init_async_event(opal_btl_usnic_module_t *module)
     }
 
     /* Get the fd to receive events on this device */
-    opal_event_set(opal_event_base, &(module->device_async_event), fd,
+    opal_event_set(opal_sync_event_base, &(module->device_async_event), fd,
                    OPAL_EV_READ | OPAL_EV_PERSIST,
                    module_async_event_callback, module);
     opal_event_add(&(module->device_async_event), NULL);
diff --git a/opal/mca/btl/usnic/btl_usnic_stats.c b/opal/mca/btl/usnic/btl_usnic_stats.c
@@ -212,7 +212,7 @@ int opal_btl_usnic_stats_init(opal_btl_usnic_module_t *module)
         module->stats.timeout.tv_sec = mca_btl_usnic_component.stats_frequency;
         module->stats.timeout.tv_usec = 0;
 
-        opal_event_set(opal_event_base, &(module->stats.timer_event),
+        opal_event_set(opal_sync_event_base, &(module->stats.timer_event),
                        -1, EV_TIMEOUT | EV_PERSIST,
                        &usnic_stats_callback, module);
         opal_event_add(&(module->stats.timer_event),
diff --git a/opal/mca/event/base/event_base_frame.c b/opal/mca/event/base/event_base_frame.c
@@ -64,7 +64,7 @@ static int opal_event_base_close(void)
 /*
  * Globals
  */
-opal_event_base_t *opal_event_base=NULL;
+opal_event_base_t *opal_sync_event_base=NULL;
 
 static int opal_event_base_open(mca_base_open_flag_t flags)
 {
@@ -84,13 +84,13 @@ static int opal_event_base_open(mca_base_open_flag_t flags)
     opal_event_use_threads();
 
     /* get our event base */
-    if (NULL == (opal_event_base = opal_event_base_create())) {
+    if (NULL == (opal_sync_event_base = opal_event_base_create())) {
         return OPAL_ERROR;
     }
 
     /* set the number of priorities */
     if (0 < OPAL_EVENT_NUM_PRI) {
-        opal_event_base_priority_init(opal_event_base, OPAL_EVENT_NUM_PRI);
+        opal_event_base_priority_init(opal_sync_event_base, OPAL_EVENT_NUM_PRI);
     }
 
     return rc;
diff --git a/opal/mca/event/event.h b/opal/mca/event/event.h
@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
- * Copyright (c) 2014      Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
  *                         reserved.
  *
diff --git a/opal/mca/event/external/external.h b/opal/mca/event/external/external.h
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2011-2013 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC.  All rights reserved.
+ * Copyright (c) 2015      Intel, Inc. All rights reserved.
  *
  * $COPYRIGHT$
  *
@@ -27,7 +28,7 @@ BEGIN_C_DECLS
 typedef struct event_base opal_event_base_t;
 typedef struct event opal_event_t;
 
-OPAL_DECLSPEC extern opal_event_base_t *opal_event_base;
+OPAL_DECLSPEC extern opal_event_base_t *opal_sync_event_base;
 
 #define OPAL_EV_TIMEOUT EV_TIMEOUT
 #define OPAL_EV_READ    EV_READ
diff --git a/opal/mca/event/libevent2022/libevent2022.h b/opal/mca/event/libevent2022/libevent2022.h
@@ -67,7 +67,7 @@ BEGIN_C_DECLS
 typedef struct event_base opal_event_base_t;
 typedef struct event opal_event_t;
 
-OPAL_DECLSPEC extern opal_event_base_t *opal_event_base;
+OPAL_DECLSPEC extern opal_event_base_t *opal_sync_event_base;
 
 #define OPAL_EV_TIMEOUT EV_TIMEOUT
 #define OPAL_EV_READ    EV_READ
diff --git a/opal/runtime/opal_cr.c b/opal/runtime/opal_cr.c
@@ -811,7 +811,7 @@ int opal_cr_coord(int state)
          * Otherwise it may/will use stale file descriptors which will disrupt
          * the intended users of the soon-to-be newly assigned file descriptors.
          */
-        opal_event_reinit(opal_event_base);
+        opal_event_reinit(opal_sync_event_base);
 
         /*
          * Flush if() functionality, since it caches system specific info.
diff --git a/opal/runtime/opal_progress.c b/opal/runtime/opal_progress.c
@@ -168,7 +168,7 @@ opal_progress(void)
                 event_progress_last_time = (num_event_users > 0) ?
                     now - event_progress_delta : now;
 
-                events += opal_event_loop(opal_event_base, opal_progress_event_flag);
+                events += opal_event_loop(opal_sync_event_base, opal_progress_event_flag);
         }
 
 #else /* OPAL_PROGRESS_USE_TIMERS */
@@ -177,7 +177,7 @@ opal_progress(void)
         if (OPAL_THREAD_ADD32(&event_progress_counter, -1) <= 0 ) {
                 event_progress_counter =
                     (num_event_users > 0) ? 0 : event_progress_delta;
-                events += opal_event_loop(opal_event_base, opal_progress_event_flag);
+                events += opal_event_loop(opal_sync_event_base, opal_progress_event_flag);
         }
 #endif /* OPAL_PROGRESS_USE_TIMERS */
 
diff --git a/orte/runtime/orte_init.c b/orte/runtime/orte_init.c
@@ -229,7 +229,7 @@ int orte_init(int* pargc, char*** pargv, orte_proc_type_t flags)
          * start their progress thread in ess_base_std_app.c
          * at the appropriate point
          */
-        orte_event_base = opal_event_base;
+        orte_event_base = opal_sync_event_base;
     }
 
     /* initialize the RTE for this environment */
diff --git a/orte/tools/orte-server/orte-server.c b/orte/tools/orte-server/orte-server.c
@@ -238,10 +238,10 @@ int main(int argc, char *argv[])
     /* Set signal handlers to catch kill signals so we can properly clean up
      * after ourselves.
      */
-    opal_event_set(opal_event_base, &term_handler, SIGTERM, OPAL_EV_SIGNAL,
+    opal_event_set(orte_event_base, &term_handler, SIGTERM, OPAL_EV_SIGNAL,
                    shutdown_callback, NULL);
     opal_event_add(&term_handler, NULL);
-    opal_event_set(opal_event_base, &int_handler, SIGINT, OPAL_EV_SIGNAL,
+    opal_event_set(orte_event_base, &int_handler, SIGINT, OPAL_EV_SIGNAL,
                    shutdown_callback, NULL);
     opal_event_add(&int_handler, NULL);
 

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`* Copyright (c) 2010-2012 Oracle and/or its affiliates. All rights reserved.`
`9`	`9`	`* Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights`
`10`	`10`	`* reserved.`
	`11`	`+ * Copyright (c) 2015 Intel, Inc. All rights reserved.`
`11`	`12`	`* $COPYRIGHT$`
`12`	`13`	`*`
`13`	`14`	`* Additional copyrights may follow`
`@@ -32,7 +33,6 @@`
`32`	`33`
`33`	`34`	`#include "opal/util/opal_environ.h"`
`34`	`35`	`#include "ompi/mca/mca.h"`
`35`		`-#include "opal/mca/base/base.h"`
`36`	`36`	`#include "opal/mca/pmix/pmix.h"`
`37`	`37`
`38`	`38`	`#include "ompi/request/request.h"`
`@@ -4440,7 +4440,7 @@ static int ft_event_exchange_bookmarks(void)`
`4440`	`4440`	`/* Wait for all bookmarks to arrive */`
`4441`	`4441`	`START_TIMER(CRCP_TIMER_CKPT_EX_WAIT);`
`4442`	`4442`	`while( total_recv_bookmarks > 0 ) {`
`4443`		`- opal_event_loop(opal_event_base, OPAL_EVLOOP_NONBLOCK);`
	`4443`	`+ opal_event_loop(opal_sync_event_base, OPAL_EVLOOP_NONBLOCK);`
`4444`	`4444`	`}`
`4445`	`4445`	`total_recv_bookmarks = 0;`
`4446`	`4446`	`END_TIMER(CRCP_TIMER_CKPT_EX_WAIT);`
`@@ -5227,7 +5227,7 @@ static int wait_quiesce_drain_ack(void)`
`5227`	`5227`	`}`
`5228`	`5228`	`}`
`5229`	`5229`
`5230`		`- opal_event_loop(opal_event_base, OPAL_EVLOOP_NONBLOCK);`
	`5230`	`+ opal_event_loop(opal_sync_event_base, OPAL_EVLOOP_NONBLOCK);`
`5231`	`5231`	`}`
`5232`	`5232`
`5233`	`5233`	`/* Clear the ack queue if it isn't already clear (it should already be) */`
Original file line number	Diff line number	Diff line change
`@@ -2207,7 +2207,7 @@ static void udcm_sent_message_constructor (udcm_message_sent_t *message)`
`2207`	`2207`	`{`
`2208`	`2208`	`memset ((char *)message + sizeof (message->super), 0,`
`2209`	`2209`	`sizeof (*message) - sizeof (message->super));`
`2210`		`- opal_event_evtimer_set(opal_event_base, &message->event, udcm_send_timeout, message);`
	`2210`	`+ opal_event_evtimer_set(opal_sync_event_base, &message->event, udcm_send_timeout, message);`
`2211`	`2211`	`}`
`2212`	`2212`
`2213`	`2213`	`static void udcm_sent_message_destructor (udcm_message_sent_t *message)`
Original file line number	Diff line number	Diff line change
`@@ -1018,7 +1018,7 @@ static mca_btl_base_module_t** usnic_component_init(int* num_btl_modules,`
`1018`	`1018`	`}`
`1019`	`1019`
`1020`	`1020`	`/* start timer to guarantee synthetic clock advances */`
`1021`		`- opal_event_set(opal_event_base, &usnic_clock_timer_event,`
	`1021`	`+ opal_event_set(opal_sync_event_base, &usnic_clock_timer_event,`
`1022`	`1022`	`-1, 0, usnic_clock_callback,`
`1023`	`1023`	`&usnic_clock_timeout);`
`1024`	`1024`	`usnic_clock_timer_event_set = true;`
Original file line number	Diff line number	Diff line change
`@@ -2102,7 +2102,7 @@ static void init_async_event(opal_btl_usnic_module_t *module)`
`2102`	`2102`	`}`
`2103`	`2103`
`2104`	`2104`	`/* Get the fd to receive events on this device */`
`2105`		`- opal_event_set(opal_event_base, &(module->device_async_event), fd,`
	`2105`	`+ opal_event_set(opal_sync_event_base, &(module->device_async_event), fd,`
`2106`	`2106`	`OPAL_EV_READ \| OPAL_EV_PERSIST,`
`2107`	`2107`	`module_async_event_callback, module);`
`2108`	`2108`	`opal_event_add(&(module->device_async_event), NULL);`