log: move logging definition to lib.h

The logging is attached to the global context and thus no low level API
is needed outside of the library. Thus move it to lib.h.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

libnvme/doc/meson.build

@@ -13,7 +13,6 @@ api_files = [
     'filters.h',
     'ioctl.h',
     'linux.h',
-    'log.h',
     'mi.h',
     'nbft.h',
     'tree.h',

libnvme/libnvme/nvme.i

@@ -510,7 +510,7 @@ struct nvme_ns {
 		else if (!strcmp(level, "crit")) log_level = LOG_CRIT;
 		else if (!strcmp(level, "alert")) log_level = LOG_ALERT;
 		else if (!strcmp(level, "emerg")) log_level = LOG_EMERG;
-		nvme_init_logging($self, log_level, false, false);
+		nvme_set_logging_level($self, log_level, false, false);
 	}
 	%pythoncode %{
 	def hosts(self):

libnvme/src/libnvme-mi.h

@@ -13,10 +13,10 @@
 extern "C" {
 #endif
 
+#include <nvme/lib.h>
 #include <nvme/types.h>
 #include <nvme/cmds.h>
 #include <nvme/mi.h>
-#include <nvme/log.h>
 
 #ifdef __cplusplus
 }

libnvme/src/libnvme.h

@@ -21,7 +21,6 @@ extern "C" {
 #include <nvme/lib-types.h>
 #include <nvme/lib.h>
 #include <nvme/linux.h>
-#include <nvme/log.h>
 #include <nvme/nbft.h>
 #include <nvme/tree.h>
 #include <nvme/types.h>

libnvme/src/libnvme.ld

@@ -85,6 +85,7 @@ LIBNVME_2_0 {
 		nvme_get_feature_length;
 		nvme_get_host_telemetry;
 		nvme_get_log;
+		nvme_get_logging_level;
 		nvme_get_logical_block_size;
 		nvme_get_new_host_telemetry;
 		nvme_get_ns_attr;
@@ -117,7 +118,6 @@ LIBNVME_2_0 {
 		nvme_init_ctrl;
 		nvme_init_ctrl_list;
 		nvme_init_dsm_range;
-		nvme_init_logging;
 		nvme_insert_tls_key;
 		nvme_insert_tls_key_compat;
 		nvme_insert_tls_key_versioned;
@@ -230,6 +230,7 @@ LIBNVME_2_0 {
 		nvme_set_etdas;
 		nvme_set_ioctl_probing;
 		nvme_set_keyring;
+		nvme_set_logging_level;
 		nvme_set_property;
 		nvme_set_root;
 		nvme_skip_namespaces;

libnvme/src/meson.build

@@ -105,7 +105,6 @@ install_headers(
         'nvme/lib-types.h',
         'nvme/lib.h',
         'nvme/linux.h',
-        'nvme/log.h',
         'nvme/mi.h',
         'nvme/nbft.h',
         'nvme/tree.h',

libnvme/src/nvme/fabrics.c

@@ -35,9 +35,7 @@
 #include <libnvme.h>
 
 #include "cleanup.h"
-#include "log.h"
 #include "private.h"
-#include "util.h"
 
 #define NVMF_HOSTID_SIZE	37
 
@@ -2818,7 +2816,7 @@ static int nbft_connect(struct nvme_global_ctx *ctx,
 
 	/* Pause logging for unavailable SSNSs */
 	if (ss && ss->unavailable && saved_log_level < 1)
-		nvme_init_logging(ctx, -1, false, false);
+		nvme_set_logging_level(ctx, -1, false, false);
 
 	if (e) {
 		if (e->trtype == NVMF_TRTYPE_TCP &&
@@ -2830,7 +2828,7 @@ static int nbft_connect(struct nvme_global_ctx *ctx,
 
 	/* Resume logging */
 	if (ss && ss->unavailable && saved_log_level < 1)
-		nvme_init_logging(ctx,
+		nvme_set_logging_level(ctx,
 				  saved_log_level,
 				  saved_log_pid,
 				  saved_log_tstamp);

libnvme/src/nvme/lib.h

@@ -10,9 +10,17 @@
 
 #include <stdio.h>
 #include <stdbool.h>
+#include <syslog.h>
 
 #include <nvme/lib-types.h>
 
+#ifndef MAX_LOGLEVEL
+#  define MAX_LOGLEVEL LOG_DEBUG
+#endif
+#ifndef DEFAULT_LOGLEVEL
+#  define DEFAULT_LOGLEVEL LOG_NOTICE
+#endif
+
 /**
  * nvme_create_global_ctx() - Initialize global context object
  * @fp:		File descriptor for logging messages
@@ -30,6 +38,33 @@ struct nvme_global_ctx *nvme_create_global_ctx(FILE *fp, int log_level);
  */
 void nvme_free_global_ctx(struct nvme_global_ctx *ctx);
 
+/**
+ * nvme_set_logging_level() - Set current logging level
+ * @ctx:	struct nvme_global_ctx object
+ * @log_level:	Logging level to set
+ * @log_pid:	Boolean to enable logging of the PID
+ * @log_tstamp:	Boolean to enable logging of the timestamp
+ *
+ * Sets the current logging level for the global context.
+ */
+void nvme_set_logging_level(struct nvme_global_ctx *ctx, int log_level,
+		bool log_pid, bool log_tstamp);
+
+/**
+ * nvme_get_logging_level() - Get current logging level
+ * @ctx:	struct nvme_global_ctx object
+ * @log_pid:	Pointer to store a current value of logging of
+ *		the PID flag at (optional).
+ * @log_tstamp:	Pointer to store a current value of logging of
+ *		the timestamp flag at (optional).
+ *
+ * Retrieves current values of logging variables.
+ *
+ * Return: current log level value or DEFAULT_LOGLEVEL if not initialized.
+ */
+int nvme_get_logging_level(struct nvme_global_ctx *ctx, bool *log_pid,
+		bool *log_tstamp);
+
 /**
  * nvme_open() - Open an nvme controller or namespace device
  * @ctx:	struct nvme_global_ctx object

libnvme/src/nvme/log.c

@@ -84,10 +84,10 @@ __nvme_msg(struct nvme_global_ctx *ctx, int level,
 		message ? message : "<error>");
 }
 
-void nvme_init_logging(struct nvme_global_ctx *ctx, int lvl,
+void nvme_set_logging_level(struct nvme_global_ctx *ctx, int log_level,
 		bool log_pid, bool log_tstamp)
 {
-	ctx->log.level = lvl;
+	ctx->log.level = log_level;
 	ctx->log.pid = log_pid;
 	ctx->log.timestamp = log_tstamp;
 }