logger: Add logger helper support

Add logger helper support for TCMU, and it just sent log message
to the system logger for now.

The nonblock logger helper will support in the next series of patches
later.

Signed-off-by: Xiubo Li <[email protected]>

Author: Xiubo Li

CMakeLists.txt

@@ -40,6 +40,7 @@ add_library(tcmu
   libtcmu.c
   libtcmu-register.c
   tcmuhandler-generated.c
+  libtcmu_log.c
   )
 set_target_properties(tcmu
   PROPERTIES
@@ -62,6 +63,7 @@ add_library(tcmu_static
   libtcmu.c
   libtcmu-register.c
   tcmuhandler-generated.c
+  libtcmu_log.c
   )
 target_include_directories(tcmu_static
   PUBLIC ${LIBNL_INCLUDE_DIR}

api.c

@@ -30,6 +30,7 @@
 #include <endian.h>
 #include <errno.h>
 
+#include "libtcmu_log.h"
 #include "libtcmu_common.h"
 #include "libtcmu_priv.h"
 
@@ -55,20 +56,20 @@ int tcmu_get_attribute(struct tcmu_device *dev, const char *name)
 
 	fd = open(path, O_RDONLY);
 	if (fd == -1) {
-		tcmu_errp(dev->ctx, "Could not open configfs to read attribute %s\n", name);
+		tcmu_err("Could not open configfs to read attribute %s\n", name);
 		return -EINVAL;
 	}
 
 	ret = read(fd, buf, sizeof(buf));
 	close(fd);
 	if (ret == -1) {
-		tcmu_errp(dev->ctx, "Could not read configfs to read attribute %s\n", name);
+		tcmu_err("Could not read configfs to read attribute %s\n", name);
 		return -EINVAL;
 	}
 
 	val = strtoul(buf, NULL, 0);
 	if (val == ULONG_MAX) {
-		tcmu_errp(dev->ctx, "could not convert string to value\n");
+		tcmu_err("could not convert string to value\n");
 		return -EINVAL;
 	}
 
@@ -95,14 +96,14 @@ static char *tcmu_get_wwn(struct tcmu_device *dev)
 
 	fd = open(path, O_RDONLY);
 	if (fd == -1) {
-		tcmu_errp(dev->ctx, "Could not open configfs to read unit serial\n");
+		tcmu_err("Could not open configfs to read unit serial\n");
 		return NULL;
 	}
 
 	ret = read(fd, buf, sizeof(buf));
 	close(fd);
 	if (ret == -1) {
-		tcmu_errp(dev->ctx, "Could not read configfs to read unit serial\n");
+		tcmu_err("Could not read configfs to read unit serial\n");
 		return NULL;
 	}
 
@@ -112,7 +113,7 @@ static char *tcmu_get_wwn(struct tcmu_device *dev)
 	/* Skip to the good stuff */
 	ret = asprintf(&ret_buf, "%s", &buf[28]);
 	if (ret == -1) {
-		tcmu_errp(dev->ctx, "could not convert string to value\n");
+		tcmu_err("could not convert string to value\n");
 		return NULL;
 	}
 
@@ -133,28 +134,28 @@ long long tcmu_get_device_size(struct tcmu_device *dev)
 
 	fd = open(path, O_RDONLY);
 	if (fd == -1) {
-		tcmu_errp(dev->ctx, "Could not open configfs to read dev info\n");
+		tcmu_err("Could not open configfs to read dev info\n");
 		return -EINVAL;
 	}
 
 	ret = read(fd, buf, sizeof(buf));
 	close(fd);
 	if (ret == -1) {
-		tcmu_errp(dev->ctx, "Could not read configfs to read dev info\n");
+		tcmu_err("Could not read configfs to read dev info\n");
 		return -EINVAL;
 	}
 	buf[sizeof(buf)-1] = '\0'; /* paranoid? Ensure null terminated */
 
 	rover = strstr(buf, " Size: ");
 	if (!rover) {
-		tcmu_errp(dev->ctx, "Could not find \" Size: \" in %s\n", path);
+		tcmu_err("Could not find \" Size: \" in %s\n", path);
 		return -EINVAL;
 	}
 	rover += 7; /* get to the value */
 
 	size = strtoull(rover, NULL, 0);
 	if (size == ULLONG_MAX) {
-		tcmu_errp(dev->ctx, "Could not get size\n");
+		tcmu_err("Could not get size\n");
 		return -EINVAL;
 	}
 

consumer.c

@@ -40,26 +40,6 @@
 #include "libtcmu.h"
 #include "scsi_defs.h"
 
-/*
- * Debug API implementation
- */
-void dbgp(const char *fmt, ...)
-{
-	va_list va;
-	va_start(va, fmt);
-	vprintf(fmt, va);
-	va_end(va);
-}
-
-void errp(const char *fmt, ...)
-{
-	va_list va;
-
-	va_start(va, fmt);
-	vfprintf(stderr, fmt, va);
-	va_end(va);
-}
-
 struct tcmu_device *tcmu_dev_array[128];
 size_t dev_array_len = 0;
 
@@ -147,7 +127,7 @@ static int foo_handle_cmd(
 		return SAM_STAT_GOOD;
 
 	default:
-		errp("unknown command %x\n", cdb[0]);
+		tcmu_err("unknown command %x\n", cdb[0]);
 		return TCMU_NOT_HANDLED;
 	}
 }
@@ -170,12 +150,14 @@ int main(int argc, char **argv)
 	int i;
 	int ret;
 
+	tcmu_log_open_syslog(TCMU_CONSUMER, 0, 0);
+
 	/* If any TCMU devices that exist that match subtype,
 	   handler->added() will now be called from within
 	   tcmulib_initialize(). */
-	tcmulib_ctx = tcmulib_initialize(&foo_handler, 1, errp);
+	tcmulib_ctx = tcmulib_initialize(&foo_handler, 1);
 	if (tcmulib_ctx <= 0) {
-		errp("tcmulib_initialize failed with %p\n", tcmulib_ctx);
+		tcmu_err("tcmulib_initialize failed with %p\n", tcmulib_ctx);
 		exit(1);
 	}
 
@@ -193,7 +175,7 @@ int main(int argc, char **argv)
 		ret = poll(pollfds, dev_array_len+1, -1);
 
 		if (ret <= 0) {
-			errp("poll() returned %d, exiting\n", ret);
+			tcmu_err("poll() returned %d, exiting\n", ret);
 			exit(1);
 		}
 
@@ -229,5 +211,7 @@ int main(int argc, char **argv)
 		}
 	}
 
+	tcmu_log_close_syslog();
+
 	return 0;
 }

file_example.c

@@ -190,29 +190,29 @@ static int file_open(struct tcmu_device *dev)
 
 	block_size = tcmu_get_attribute(dev, "hw_block_size");
 	if (block_size < 0) {
-		errp("Could not get device block size\n");
+		tcmu_err("Could not get device block size\n");
 		goto err;
 	}
 	tcmu_set_dev_block_size(dev, block_size);
 
 	size = tcmu_get_device_size(dev);
 	if (size < 0) {
-		errp("Could not get device size\n");
+		tcmu_err("Could not get device size\n");
 		goto err;
 	}
 
 	tcmu_set_dev_num_lbas(dev, size / block_size);
 
 	config = strchr(tcmu_get_dev_cfgstring(dev), '/');
 	if (!config) {
-		errp("no configuration found in cfgstring\n");
+		tcmu_err("no configuration found in cfgstring\n");
 		goto err;
 	}
 	config += 1; /* get past '/' */
 
 	state->fd = open(config, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR);
 	if (state->fd == -1) {
-		errp("could not open %s: %m\n", config);
+		tcmu_err("could not open %s: %m\n", config);
 		goto err;
 	}
 
@@ -348,7 +348,7 @@ static int file_handle_cmd(
 
 		ret = pread(state->fd, buf, length, offset);
 		if (ret == -1) {
-			errp("read failed: %m\n");
+			tcmu_err("read failed: %m\n");
 			free(buf);
 			return set_medium_error(sense);
 		}
@@ -377,7 +377,7 @@ static int file_handle_cmd(
 
 			ret = pwrite(state->fd, iovec->iov_base, to_copy, offset);
 			if (ret == -1) {
-				errp("Could not write: %m\n");
+				tcmu_err("Could not write: %m\n");
 				return set_medium_error(sense);
 			}
 
@@ -390,7 +390,7 @@ static int file_handle_cmd(
 	}
 	break;
 	default:
-		errp("unknown command %x\n", cdb[0]);
+		tcmu_err("unknown command %x\n", cdb[0]);
 		return TCMU_NOT_HANDLED;
 	}
 }