Move global logging variables into nvme_root_t

Move the global logging variables into nvme_root_t to make them
settable by the application.

Signed-off-by: Hannes Reinecke <[email protected]>

Author: hreinecke

libnvme/nvme.i

@@ -339,29 +339,30 @@ struct nvme_ns {
 
 %extend nvme_root {
   nvme_root(const char *config_file = NULL) {
-    nvme_log_level = LOG_ERR;
     return nvme_scan(config_file);
   }
   ~nvme_root() {
     nvme_free_tree($self);
   }
   void log_level(const char *level) {
+    int log_level = DEFAULT_LOGLEVEL;
     if (!strcmp(level,"debug"))
-      nvme_log_level = LOG_DEBUG;
+      log_level = LOG_DEBUG;
     else if (!strcmp(level, "info"))
-      nvme_log_level = LOG_INFO;
+      log_level = LOG_INFO;
     else if (!strcmp(level, "notice"))
-      nvme_log_level = LOG_NOTICE;
+      log_level = LOG_NOTICE;
     else if (!strcmp(level, "warning"))
-      nvme_log_level = LOG_WARNING;
+      log_level = LOG_WARNING;
     else if (!strcmp(level, "err"))
-      nvme_log_level = LOG_ERR;
+      log_level = LOG_ERR;
     else if (!strcmp(level, "crit"))
-      nvme_log_level = LOG_CRIT;
+      log_level = LOG_CRIT;
     else if (!strcmp(level, "alert"))
-      nvme_log_level = LOG_ALERT;
+      log_level = LOG_ALERT;
     else if (!strcmp(level, "emerg"))
-      nvme_log_level = LOG_EMERG;
+      log_level = LOG_EMERG;
+    nvme_init_logging($self, log_level, false, false);
   }
   struct nvme_host *hosts() {
     return nvme_first_host($self);

src/libnvme.map

@@ -169,12 +169,12 @@ LIBNVME_1_0 {
 		nvme_init_ctrl;
 		nvme_init_ctrl_list;
 		nvme_init_dsm_range;
+		nvme_init_logging;
 		nvme_init_id_ns;
 		nvme_io;
 		nvme_io_passthru64;
 		nvme_io_passthru;
 		nvme_lockdown;
-		nvme_log_level;
 		nvme_lookup_host;
 		nvme_lookup_subsystem;
 		nvme_namespace_attach_ctrls;
@@ -227,6 +227,7 @@ LIBNVME_1_0 {
 		nvme_path_get_sysfs_dir;
 		nvme_paths_filter;
 		nvme_read;
+		nvme_read_config;
 		nvme_refresh_topology;
 		nvme_rescan_ctrl;
 		nvme_reset_topology;

src/nvme/log.c

@@ -33,10 +33,6 @@
 #define LOG_CLOCK CLOCK_MONOTONIC
 #endif
 
-int nvme_log_level = DEFAULT_LOGLEVEL;
-bool nvme_log_timestamp;
-bool nvme_log_pid;
-
 void __attribute__((format(printf, 4, 5)))
 __nvme_msg(nvme_root_t r, int lvl,
 	   const char *func, const char *format, ...)
@@ -59,7 +55,7 @@ __nvme_msg(nvme_root_t r, int lvl,
 	char *message __cleanup__(cleanup_charp) = NULL;
 	int idx;
 
-	if (nvme_log_timestamp) {
+	if (r->log_timestamp) {
 		struct timespec now;
 
 		clock_gettime(LOG_CLOCK, &now);
@@ -68,13 +64,13 @@ __nvme_msg(nvme_root_t r, int lvl,
 	} else
 		*timebuf = '\0';
 
-	if (nvme_log_pid)
+	if (r->log_pid)
 		snprintf(pidbuf, sizeof(pidbuf), "%ld", (long)getpid());
 	else
 		*pidbuf = '\0';
 
-	idx = ((nvme_log_timestamp ? 1 : 0) << 2) |
-		((nvme_log_pid ? 1 : 0) << 1) | (func ? 1 : 0);
+	idx = ((r->log_timestamp ? 1 : 0) << 2) |
+		((r->log_pid ? 1 : 0) << 1) | (func ? 1 : 0);
 
 	if (asprintf(&header, formats[idx], timebuf, pidbuf, func ? func : "")
 	    == -1)
@@ -85,8 +81,15 @@ __nvme_msg(nvme_root_t r, int lvl,
 		message = NULL;
 	va_end(ap);
 
-	if (lvl <= nvme_log_level)
+	if (lvl <= r->log_level)
 		fprintf(fp, "%s%s", header ? header : "<error>",
 			message ? message : "<error>");
 
 }
+
+void nvme_init_logging(nvme_root_t r, int lvl, bool log_pid, bool log_tstamp)
+{
+	r->log_level = lvl;
+	r->log_pid = log_pid;
+	r->log_timestamp = log_tstamp;
+}

src/nvme/log.h

@@ -21,9 +21,6 @@
 #define __nvme_log_func NULL
 #endif
 
-extern int nvme_log_level;
-extern bool nvme_log_timestamp;
-extern bool nvme_log_pid;
 extern char *nvme_log_message;
 
 void __attribute__((format(printf, 4, 5)))
@@ -36,4 +33,15 @@ __nvme_msg(nvme_root_t r, int lvl, const char *func, const char *format, ...);
 				   format, ##__VA_ARGS__);		\
 	} while (0)
 
+/**
+ * nvme_init_logging() - initialize logging
+ * @r: nvme_root_t context
+ * @lvl: logging level to set
+ * @log_pid: boolean to enable logging of the PID
+ * @log_tstamp: boolean to enable logging of the timestamp
+ *
+ * Sets the default logging variables for the library.
+ */
+void nvme_init_logging(nvme_root_t r, int lvl, bool log_pid, bool log_tstamp);
+
 #endif /* _LOG_H */

src/nvme/private.h

@@ -121,6 +121,9 @@ struct nvme_root {
 	char *config_file;
 	struct list_head hosts;
 	FILE *fp;
+	int log_level;
+	bool log_pid;
+	bool log_timestamp;
 	bool modified;
 };
 

src/nvme/tree.c

@@ -118,14 +118,15 @@ static int nvme_scan_topology(struct nvme_root *r, nvme_scan_filter_t f)
 	return 0;
 }
 
-nvme_root_t nvme_scan_filter(nvme_scan_filter_t f, FILE *fp)
+nvme_root_t nvme_scan_filter(nvme_scan_filter_t f, FILE *fp, int log_level)
 {
 	struct nvme_root *r = calloc(1, sizeof(*r));
 
 	if (!r) {
 		errno = ENOMEM;
 		return NULL;
 	}
+	r->log_level = log_level;
 	r->fp = stderr;
 	if (fp)
 		r->fp = fp;
@@ -134,16 +135,22 @@ nvme_root_t nvme_scan_filter(nvme_scan_filter_t f, FILE *fp)
 	return r;
 }
 
-nvme_root_t nvme_scan(const char *config_file)
+void nvme_read_config(nvme_root_t r, const char *config_file)
 {
-	nvme_root_t r = nvme_scan_filter(NULL, NULL);
-
 #ifdef CONFIG_JSONC
 	if (r && config_file) {
 		json_read_config(r, config_file);
 		r->config_file = strdup(config_file);
 	}
 #endif
+}
+
+nvme_root_t nvme_scan(const char *config_file)
+{
+	nvme_root_t r = nvme_scan_filter(NULL, NULL, DEFAULT_LOGLEVEL);
+
+	nvme_read_config(r, config_file);
+
 	return r;
 }
 

src/nvme/tree.h

@@ -970,13 +970,14 @@ const char *nvme_subsystem_get_type(nvme_subsystem_t s);
  * nvme_scan_filter() - Scan NVMe topology and apply filter
  * @f: filter to apply
  * @fp: filepointer for error messages
+ * @log_level: logging level for this structure
  *
  * Scans the NVMe topology and filters out the resulting elements
  * by applying @f.
  *
  * Return: nvme_root_t structure holding the resulting elements.
  */
-nvme_root_t nvme_scan_filter(nvme_scan_filter_t f, FILE *fp);
+nvme_root_t nvme_scan_filter(nvme_scan_filter_t f, FILE *fp, int log_level);
 
 /**
  * nvme_host_get_hostnqn() -
@@ -1016,6 +1017,16 @@ void nvme_free_host(nvme_host_t h);
  */
 nvme_root_t nvme_scan(const char *config_file);
 
+/**
+ * nvme_read_config() - Read NVMe json configuration file
+ * @r: nvme_root_t object
+ * @config_file: json configuration file
+ *
+ * Read in the contents of @config_file and merge them with
+ * the elements in @r.
+ */
+void nvme_read_config(nvme_root_t r, const char *config_file);
+
 /**
  * nvme_refresh_topology() -
  * @r:

test/test.c

@@ -318,7 +318,8 @@ int main(int argc, char **argv)
 
 	printf("Test filter for common loop back target\n");
 	nqn_match = "testnqn";
-	r = nvme_scan_filter(nvme_match_subsysnqn_filter, NULL);
+	r = nvme_scan_filter(nvme_match_subsysnqn_filter, NULL,
+			     DEFAULT_LOGLEVEL);
 	nvme_for_each_host(r, h) {
 		nvme_for_each_subsystem(h, s) {
 			printf("%s - NQN=%s\n", nvme_subsystem_get_name(s),