X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fplugin.c;h=8cd490a22a7da2f39e946f4d06be445fda1ebba7;hb=f16f904e1f266e079ba6f06ae7952a11b29d5dfd;hp=873e64a19436903c379bff983565c825008f2a43;hpb=851c33e513e67986fa3efa68400564b457d69d17;p=sysdb.git

diff --git a/src/core/plugin.c b/src/core/plugin.c
index 873e64a..8cd490a 100644
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
@@ -442,7 +442,8 @@ module_init(const char *name, lt_dlhandle lh, sdb_plugin_info_t *info)
 } /* module_init */
 
 static int
-module_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
+module_load(const char *basedir, const char *name,
+		const sdb_plugin_ctx_t *plugin_ctx)
 {
 	char  base_name[name ? strlen(name) + 1 : 1];
 	const char *name_ptr;
@@ -455,6 +456,8 @@ module_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
 
 	int status;
 
+	assert(name);
+
 	base_name[0] = '\0';
 	name_ptr = name;
 
@@ -465,8 +468,10 @@ module_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
 	}
 	strcat(base_name, name_ptr);
 
-	snprintf(filename, sizeof(filename), "%s/%s.so",
-			PKGLIBDIR, base_name);
+	if (! basedir)
+		basedir = PKGLIBDIR;
+
+	snprintf(filename, sizeof(filename), "%s/%s.so", basedir, base_name);
 	filename[sizeof(filename) - 1] = '\0';
 
 	if (access(filename, R_OK)) {
@@ -573,7 +578,8 @@ plugin_add_callback(sdb_llist_t **list, const char *type,
  */
 
 int
-sdb_plugin_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
+sdb_plugin_load(const char *basedir, const char *name,
+		const sdb_plugin_ctx_t *plugin_ctx)
 {
 	ctx_t *ctx;
 
@@ -610,7 +616,7 @@ sdb_plugin_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
 		return 0;
 	}
 
-	return module_load(name, plugin_ctx);
+	return module_load(basedir, name, plugin_ctx);
 } /* sdb_plugin_load */
 
 int
@@ -931,6 +937,36 @@ sdb_plugin_init_all(void)
 	return ret;
 } /* sdb_plugin_init_all */
 
+int
+sdb_plugin_shutdown_all(void)
+{
+	sdb_llist_iter_t *iter;
+	int ret = 0;
+
+	iter = sdb_llist_get_iter(shutdown_list);
+	while (sdb_llist_iter_has_next(iter)) {
+		sdb_plugin_cb_t *cb;
+		sdb_plugin_shutdown_cb callback;
+		ctx_t *old_ctx;
+
+		sdb_object_t *obj = sdb_llist_iter_get_next(iter);
+		assert(obj);
+		cb = SDB_PLUGIN_CB(obj);
+
+		callback = (sdb_plugin_shutdown_cb)cb->cb_callback;
+
+		old_ctx = ctx_set(cb->cb_ctx);
+		if (callback(cb->cb_user_data)) {
+			sdb_log(SDB_LOG_ERR, "core: Failed to shutdown plugin '%s'.",
+					obj->name);
+			++ret;
+		}
+		ctx_set(old_ctx);
+	}
+	sdb_llist_iter_destroy(iter);
+	return ret;
+} /* sdb_plugin_shutdown_all */
+
 int
 sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
 {
@@ -973,13 +1009,21 @@ sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
 					sdb_log(SDB_LOG_ERR, "core: Failed to sleep "
 							"in collector main loop: %s",
 							sdb_strerror(errno, errbuf, sizeof(errbuf)));
+					sdb_llist_insert_sorted(collector_list, obj,
+							plugin_cmp_next_update);
+					sdb_object_deref(obj);
 					return -1;
 				}
 				errno = 0;
 			}
 
-			if (! loop->do_loop)
+			if (! loop->do_loop) {
+				/* put back; don't worry about errors */
+				sdb_llist_insert_sorted(collector_list, obj,
+						plugin_cmp_next_update);
+				sdb_object_deref(obj);
 				return 0;
+			}
 		}
 
 		old_ctx = ctx_set(SDB_PLUGIN_CCB(obj)->ccb_ctx);