X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Finit.h;h=a9367697a85f340d2dce283d6233396d8cb494c4;hb=5a2ec8fc41d14ffc5275ab88761c1fb7e0420a33;hp=4fa5b3045907134f276359f3e503586b85b05bd2;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vlib/init.h b/src/vlib/init.h
index 4fa5b304590..a9367697a85 100644
--- a/src/vlib/init.h
+++ b/src/vlib/init.h
@@ -79,6 +79,27 @@ typedef struct vlib_config_function_runtime_t
   char name[32];
 } vlib_config_function_runtime_t;
 
+#define VLIB_REMOVE_FROM_LINKED_LIST(first,p,next)              \
+{                                                               \
+  ASSERT (first);                                               \
+  if (first == p)                                               \
+      first = (p)->next;                                        \
+  else                                                          \
+    {                                                           \
+      __typeof__ (p) current = first;                           \
+      while (current->next)                                     \
+	{                                                       \
+	  if (current->next == p)                               \
+	    {                                                   \
+	      current->next = current->next->next;              \
+	      break;                                            \
+	    }                                                   \
+	  current = current->next;                              \
+	}                                                       \
+      ASSERT (current);                                         \
+    }                                                           \
+}
+
 #define _VLIB_INIT_FUNCTION_SYMBOL(x, type)	\
   _vlib_##type##_function_##x
 
@@ -94,6 +115,7 @@ typedef struct vlib_config_function_runtime_t
 /* Declaration is global (e.g. not static) so that init functions can
    be called from other modules to resolve init function depend. */
 
+#ifndef CLIB_MARCH_VARIANT
 #define VLIB_DECLARE_INIT_FUNCTION(x, tag)                      \
 vlib_init_function_t * _VLIB_INIT_FUNCTION_SYMBOL (x, tag) = x; \
 static void __vlib_add_##tag##_function_##x (void)              \
@@ -106,15 +128,47 @@ static void __vlib_add_##tag##_function_##x (void)              \
     = vm->tag##_function_registrations;                         \
   vm->tag##_function_registrations = &_vlib_init_function;      \
  _vlib_init_function.f = &x;                                    \
+}                                                               \
+static void __vlib_rm_##tag##_function_##x (void)               \
+    __attribute__((__destructor__)) ;                           \
+static void __vlib_rm_##tag##_function_##x (void)               \
+{                                                               \
+  vlib_main_t * vm = vlib_get_main();                           \
+  _vlib_init_function_list_elt_t *next;                         \
+  if (vm->tag##_function_registrations->f == &x)                \
+    {                                                           \
+      vm->tag##_function_registrations =                        \
+        vm->tag##_function_registrations->next_init_function;   \
+      return;                                                   \
+    }                                                           \
+  next = vm->tag##_function_registrations;                      \
+  while (next->next_init_function)                              \
+    {                                                           \
+      if (next->next_init_function->f == &x)                    \
+        {                                                       \
+          next->next_init_function =                            \
+            next->next_init_function->next_init_function;       \
+          return;                                               \
+        }                                                       \
+      next = next->next_init_function;                          \
+    }                                                           \
 }
+#else
+/* create unused pointer to silence compiler warnings and get whole
+   function optimized out */
+#define VLIB_DECLARE_INIT_FUNCTION(x, tag)                      \
+static __clib_unused void * __clib_unused_##tag##_##x = x;
+#endif
 
 #define VLIB_INIT_FUNCTION(x) VLIB_DECLARE_INIT_FUNCTION(x,init)
+#define VLIB_WORKER_INIT_FUNCTION(x) VLIB_DECLARE_INIT_FUNCTION(x,worker_init)
 
 #define VLIB_MAIN_LOOP_ENTER_FUNCTION(x) \
   VLIB_DECLARE_INIT_FUNCTION(x,main_loop_enter)
 #define VLIB_MAIN_LOOP_EXIT_FUNCTION(x) \
 VLIB_DECLARE_INIT_FUNCTION(x,main_loop_exit)
 
+#ifndef CLIB_MARCH_VARIANT
 #define VLIB_CONFIG_FUNCTION(x,n,...)                           \
     __VA_ARGS__ vlib_config_function_runtime_t                  \
     VLIB_CONFIG_FUNCTION_SYMBOL(x);                             \
@@ -127,6 +181,16 @@ static void __vlib_add_config_function_##x (void)               \
        = vm->config_function_registrations;                     \
     vm->config_function_registrations                           \
        = &VLIB_CONFIG_FUNCTION_SYMBOL(x);                       \
+}                                                               \
+static void __vlib_rm_config_function_##x (void)                \
+    __attribute__((__destructor__)) ;                           \
+static void __vlib_rm_config_function_##x (void)                \
+{                                                               \
+    vlib_main_t * vm = vlib_get_main();                         \
+    vlib_config_function_runtime_t *p =                         \
+       & VLIB_CONFIG_FUNCTION_SYMBOL (x);                       \
+    VLIB_REMOVE_FROM_LINKED_LIST                                \
+      (vm->config_function_registrations, p, next_registration);\
 }                                                               \
   vlib_config_function_runtime_t                                \
     VLIB_CONFIG_FUNCTION_SYMBOL (x)                             \
@@ -135,7 +199,20 @@ static void __vlib_add_config_function_##x (void)               \
     .function = x,                                              \
     .is_early = 0,						\
   }
+#else
+/* create unused pointer to silence compiler warnings and get whole
+   function optimized out */
+#define VLIB_CONFIG_FUNCTION(x,n,...)                           \
+  static __clib_unused vlib_config_function_runtime_t           \
+    VLIB_CONFIG_FUNCTION_SYMBOL (__clib_unused_##x)             \
+  = {                                                           \
+    .name = n,                                                  \
+    .function = x,                                              \
+    .is_early = 0,						\
+  }
+#endif
 
+#ifndef CLIB_MARCH_VARIANT
 #define VLIB_EARLY_CONFIG_FUNCTION(x,n,...)                     \
     __VA_ARGS__ vlib_config_function_runtime_t                  \
     VLIB_CONFIG_FUNCTION_SYMBOL(x);                             \
@@ -148,6 +225,16 @@ static void __vlib_add_config_function_##x (void)               \
        = vm->config_function_registrations;                     \
     vm->config_function_registrations                           \
        = &VLIB_CONFIG_FUNCTION_SYMBOL(x);                       \
+}                                                               \
+static void __vlib_rm_config_function_##x (void)                \
+    __attribute__((__destructor__)) ;                           \
+static void __vlib_rm_config_function_##x (void)                \
+{                                                               \
+    vlib_main_t * vm = vlib_get_main();                         \
+    vlib_config_function_runtime_t *p =                         \
+       & VLIB_CONFIG_FUNCTION_SYMBOL (x);                       \
+    VLIB_REMOVE_FROM_LINKED_LIST                                \
+      (vm->config_function_registrations, p, next_registration);\
 }                                                               \
   vlib_config_function_runtime_t                                \
     VLIB_CONFIG_FUNCTION_SYMBOL (x)                             \
@@ -156,6 +243,18 @@ static void __vlib_add_config_function_##x (void)               \
     .function = x,                                              \
     .is_early = 1,						\
   }
+#else
+/* create unused pointer to silence compiler warnings and get whole
+   function optimized out */
+#define VLIB_EARLY_CONFIG_FUNCTION(x,n,...)                     \
+  static __clib_unused vlib_config_function_runtime_t           \
+    VLIB_CONFIG_FUNCTION_SYMBOL (__clib_unused_##x)             \
+  = {                                                           \
+    .name = n,                                                  \
+    .function = x,                                              \
+    .is_early = 1,						\
+  }
+#endif
 
 /* Call given init function: used for init function dependencies. */
 #define vlib_call_init_function(vm, x)					\