- Fix amfd/sgproc.cc cause compile failed when configure enable gcov.
- Waiting svc_monitor_thread ready in create_svc_monitor_thread to avoid
lost svc_mon_thr_fd value which later cause opensafd fail to start.
---
src/amf/amfd/sgproc.cc | 3 +--
src/nid/nodeinit.cc | 19 +++++++++----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/amf/amfd/sgproc.cc b/src/amf/amfd/sgproc.cc
index 78ccb31f9..405e2c45d 100644
--- a/src/amf/amfd/sgproc.cc
+++ b/src/amf/amfd/sgproc.cc
@@ -2624,9 +2624,8 @@ static uint32_t shutdown_contained_sus(AVD_CL_CB *cb,
AVD_SU *container_su,
}
done:
- return rc;
-
TRACE_LEAVE();
+ return rc;
}
/*****************************************************************************
diff --git a/src/nid/nodeinit.cc b/src/nid/nodeinit.cc
index d5b4eb20a..548c7fb46 100644
--- a/src/nid/nodeinit.cc
+++ b/src/nid/nodeinit.cc
@@ -1612,6 +1612,15 @@ uint32_t create_svc_monitor_thread(void) {
return NCSCC_RC_FAILURE;
}
+ // Waiting until svc_monitor_thread is up and in ready state.
+ unsigned no_repeat = 0;
+ while (svc_monitor_thread_ready == false && no_repeat < 100) {
+ osaf_nanosleep(&kHundredMilliseconds);
+ no_repeat++;
+ }
+ osafassert(svc_monitor_thread_ready);
+ LOG_NO("svc_monitor_thread is up and in ready state");
+
TRACE_LEAVE();
return NCSCC_RC_SUCCESS;
}
@@ -1662,16 +1671,6 @@ int main(int argc, char *argv[]) {
exit(EXIT_FAILURE);
}
- // Waiting until svc_monitor_thread is up and in ready state.
- unsigned no_repeat = 0;
- while (svc_monitor_thread_ready == false && no_repeat < 100) {
- osaf_nanosleep(&kHundredMilliseconds);
- no_repeat++;
- }
-
- osafassert(svc_monitor_thread_ready);
- LOG_NO("svc_monitor_thread is up and in ready state");
-
if (parse_nodeinit_conf(sbuf) != NCSCC_RC_SUCCESS) {
LOG_ER("Failed to parse file %s. Exiting", sbuf);
exit(EXIT_FAILURE);
--
2.17.1
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
