Преглед на файлове

core: keep a global flag in shm for shut down phase

- set when destroy modules is starting
- useful to check from other processes if shut down started
Daniel-Constantin Mierla преди 5 години
родител
ревизия
6da946e4a3
променени са 3 файла, в които са добавени 26 реда и са изтрити 0 реда
  1. 22 0
      src/core/sr_module.c
  2. 2 0
      src/core/sr_module.h
  3. 2 0
      src/main.c

+ 22 - 0
src/core/sr_module.c

@@ -109,6 +109,24 @@ unsigned int set_modinit_delay(unsigned int v)
 	return r;
 }
 
+/* shut down phase for instance - kept in shared memory */
+static int *_ksr_shutdown_phase = 0;
+
+int ksr_shutdown_phase_init(void)
+{
+	if(_ksr_shutdown_phase) {
+		_ksr_shutdown_phase = (int*)shm_malloc(sizeof(int));
+	}
+	return 0;
+}
+/**
+ * return destroy modules phase state
+ */
+int ksr_shutdown_phase(void)
+{
+	return (_ksr_shutdown_phase)?(*_ksr_shutdown_phase):0;
+}
+
 /* keep state if server is in destroy modules phase */
 static int _sr_destroy_modules_phase = 0;
 
@@ -738,6 +756,10 @@ void destroy_modules()
 	struct sr_module* t, *foo;
 
 	_sr_destroy_modules_phase = 1;
+	if(_ksr_shutdown_phase!=NULL) {
+		*_ksr_shutdown_phase = 1;
+	}
+
 	/* call first destroy function from each module */
 	t=modules;
 	while(t) {

+ 2 - 0
src/core/sr_module.h

@@ -544,5 +544,7 @@ int is_rpc_worker(int rank);
 
 unsigned int set_modinit_delay(unsigned int v);
 int destroy_modules_phase(void);
+int ksr_shutdown_phase_init(void);
+int ksr_shutdown_phase(void);
 
 #endif /* sr_module_h */

+ 2 - 0
src/main.c

@@ -2542,6 +2542,8 @@ try_again:
 	if (ksr_route_locks_set_init()<0)
 		goto error;
 
+	ksr_shutdown_phase_init();
+
 	/* init lookup for core event routes */
 	sr_core_ert_init();