error-injection: moved from linked list to static array

core/errinj.m

@@ -35,34 +35,30 @@
 #include "tbuf.h"
 #include "errinj.h"
 
-/**
- * Initialize error injection list.
- */
-void
-errinj_init(void)
-{
-	TAILQ_INIT(&errinjs);
-}
+struct errinj {
+	char *name;
+	bool state;
+};
 
 /**
- * Free error injection list.
+ * error injection list.
  */
-void
-errinj_free(void)
+static struct errinj errinjs[] =
 {
-	struct errinj *inj, *injn;
-	TAILQ_FOREACH_SAFE(inj, &errinjs, next, injn) {
-		free(inj->name);
-	}
-}
+#ifndef NDEBUG
+	{ "errinj-testing", false },
+#endif
+	{ NULL, false }
+};
 
 static struct errinj*
 errinj_match(char *name)
 {
-	struct errinj *inj;
-	TAILQ_FOREACH(inj, &errinjs, next)
-		if (strcmp(inj->name, name) == 0)
-			return inj;
+	int i;
+	for (i = 0 ; errinjs[i].name ; i++) {
+		if (strcmp(errinjs[i].name, name) == 0)
+			return &errinjs[i];
+	}
 	return NULL;
 }
 
@@ -82,30 +78,6 @@ errinj_state(char *name)
 	return inj->state;
 }
 
-/**
- * Add new error injection handle.
- *
- * @param name error injection name.
- *
- * @return error injection structure pointer on success, NULL on error.
- */
-struct errinj*
-errinj_add(char *name)
-{
-	assert(errinj_match(name) == NULL);
-	struct errinj *inj = malloc(sizeof(struct errinj));
-	if (inj == NULL) 
-		return NULL;
-	inj->name = strdup(name);
-	if (inj->name == NULL) {
-		free(inj);
-		return NULL;
-	}
-	inj->state = false;
-	TAILQ_INSERT_TAIL(&errinjs, inj, next);
-	return inj;
-}
-
 /**
  * Set state of the error injection handle.
  *
@@ -133,8 +105,9 @@ void
 errinj_info(struct tbuf *out)
 {
 	tbuf_printf(out, "error injections:" CRLF);
-	struct errinj *inj;
-	TAILQ_FOREACH(inj, &errinjs, next) {
+	int i;
+	for (i = 0 ; errinjs[i].name ; i++) {
+		struct errinj *inj = &errinjs[i];
 		tbuf_printf(out, "  - name: %s" CRLF, inj->name);
 		tbuf_printf(out, "    state: %s" CRLF,
 			    (inj->state) ? "on" : "off");

core/tarantool.m

@@ -367,7 +367,6 @@ tarantool_free(void)
 
 	fiber_free();
 	palloc_free();
-	errinj_free();
 	ev_default_destroy();
 #ifdef ENABLE_GCOV
 	__gcov_flush();
@@ -381,10 +380,6 @@ tarantool_free(void)
 static void
 initialize(double slab_alloc_arena, int slab_alloc_minimal, double slab_alloc_factor)
 {
-	errinj_init();
-#ifndef NDEBUG
-	errinj_add("errinj-testing");
-#endif
 	if (!salloc_init(slab_alloc_arena * (1 << 30), slab_alloc_minimal, slab_alloc_factor))
 		panic_syserror("can't initialize slab allocator");
 	fiber_init();

include/errinj.h

@@ -28,17 +28,6 @@
 #include "exception.h"
 #include "third_party/queue.h"
 
-struct errinj {
-	char *name;
-	bool state;
-	TAILQ_ENTRY(errinj) next;
-};
-
-TAILQ_HEAD(, errinj) errinjs;
-
-void errinj_init(void);
-void errinj_free(void);
-struct errinj *errinj_add(char *name);
 bool errinj_state(char *name);
 void errinj_info(struct tbuf *out);
 bool errinj_set(char *name, bool state);