Split libmultipath and libmpathutil
Subsystems (2)
v3 cover Split libmultipath and libmpathutil
From: Martin Wilck <[email protected]>
The CI found a few more glitches in my v2 patch set. Not reposting the entire set here, just the changed patches.
Changes v2->v3:
fix compilation errors on Alpine an CI errors.
Hannes Reinecke (1):
multipathd: replace libreadline with getline()
Martin Wilck (10):
.gitignore: ignore generated ABI files
libmultipath: move all reservation key functions to prkey.c
libmultipath: always set _GNU_SOURCE
multipath-tools: Makefile: fix dependencies for "install" target libmultipath checkers/prioritizers: search for includes in
libmultipath
libmultipath: remove weak attribute for {get,put}_multipath_config
libmultipath: split off libmpathutil
multipathc: add new interactive client program
multipathd: exec multipathc in interactive mode
multipathd: fix incompatible pointer type error with libedit
.gitignore | 3 +
Makefile | 8 +-
Makefile.inc | 5 +-
libmpathpersist/Makefile | 6 +-
libmpathutil/Makefile | 70 +++++
{libmultipath => libmpathutil}/debug.c | 0
{libmultipath => libmpathutil}/debug.h | 0
libmpathutil/globals.c | 12 +
libmpathutil/globals.h | 39 +++
libmpathutil/libmpathutil.version | 122 +++++++++
{libmultipath => libmpathutil}/log.c | 0
{libmultipath => libmpathutil}/log.h | 0
{libmultipath => libmpathutil}/log_pthread.c | 0
{libmultipath => libmpathutil}/log_pthread.h | 0
{libmultipath => libmpathutil}/parser.c | 0
{libmultipath => libmpathutil}/parser.h | 2 +-
{libmultipath => libmpathutil}/strbuf.c | 0
{libmultipath => libmpathutil}/strbuf.h | 0
{libmultipath => libmpathutil}/time-util.c | 0
{libmultipath => libmpathutil}/time-util.h | 0
{libmultipath => libmpathutil}/util.c | 32 ---
{libmultipath => libmpathutil}/util.h | 2 -
{libmultipath => libmpathutil}/uxsock.c | 0
{libmultipath => libmpathutil}/uxsock.h | 0
{libmultipath => libmpathutil}/vector.c | 0
{libmultipath => libmpathutil}/vector.h | 0
libmpathvalid/Makefile | 6 +-
libmultipath/Makefile | 17 +-
libmultipath/checkers/Makefile | 7 +-
libmultipath/checkers/directio.c | 4 +-
libmultipath/checkers/emc_clariion.c | 2 +-
libmultipath/checkers/hp_sw.c | 4 +-
libmultipath/checkers/rdac.c | 2 +-
libmultipath/checkers/tur.c | 8 +-
libmultipath/config.c | 4 +-
libmultipath/config.h | 14 +-
libmultipath/dict.c | 16 +-
libmultipath/dict.h | 2 -
libmultipath/foreign/Makefile | 6 +-
libmultipath/libmultipath.version | 41 ---
libmultipath/prioritizers/Makefile | 8 +-
libmultipath/prioritizers/alua_rtpg.c | 2 +-
libmultipath/prkey.c | 49 +++-
libmultipath/prkey.h | 3 +
mpathpersist/Makefile | 4 +-
multipath/Makefile | 6 +-
multipathd/Makefile | 43 ++-
multipathd/cli.c | 128 +--------
multipathd/cli.h | 5 +-
multipathd/main.c | 15 +-
multipathd/multipathc.c | 271 +++++++++++++++++++
multipathd/uxclnt.c | 108 +-------
tests/Makefile | 12 +-
53 files changed, 693 insertions(+), 395 deletions(-)
create mode 100644 libmpathutil/Makefile
rename {libmultipath => libmpathutil}/debug.c (100%)
rename {libmultipath => libmpathutil}/debug.h (100%)
create mode 100644 libmpathutil/globals.c
create mode 100644 libmpathutil/globals.h
create mode 100644 libmpathutil/libmpathutil.version
rename {libmultipath => libmpathutil}/log.c (100%)
rename {libmultipath => libmpathutil}/log.h (100%)
rename {libmultipath => libmpathutil}/log_pthread.c (100%)
rename {libmultipath => libmpathutil}/log_pthread.h (100%)
rename {libmultipath => libmpathutil}/parser.c (100%)
rename {libmultipath => libmpathutil}/parser.h (99%)
rename {libmultipath => libmpathutil}/strbuf.c (100%)
rename {libmultipath => libmpathutil}/strbuf.h (100%)
rename {libmultipath => libmpathutil}/time-util.c (100%)
rename {libmultipath => libmpathutil}/time-util.h (100%)
rename {libmultipath => libmpathutil}/util.c (92%)
rename {libmultipath => libmpathutil}/util.h (96%)
rename {libmultipath => libmpathutil}/uxsock.c (100%)
rename {libmultipath => libmpathutil}/uxsock.h (100%)
rename {libmultipath => libmpathutil}/vector.c (100%)
rename {libmultipath => libmpathutil}/vector.h (100%)
create mode 100644 multipathd/multipathc.cSignature · 6 lines
2.37.1 -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
PATCH v3 6/11 libmultipath checkers/prioritizers: search for includes in libmultipath
From: Martin Wilck <[email protected]>
Set TOPDIR correctly rather than using hard-coded "../". Also remove duplicate -lmultipath in checkers makefile.
--- libmultipath/checkers/Makefile | 5 +++-- libmultipath/checkers/directio.c | 4 ++-- libmultipath/checkers/emc_clariion.c | 2 +- libmultipath/checkers/hp_sw.c | 4 ++-- libmultipath/checkers/rdac.c | 2 +- libmultipath/checkers/tur.c | 8 ++++---- libmultipath/foreign/Makefile | 4 ++-- libmultipath/prioritizers/Makefile | 6 ++++-- libmultipath/prioritizers/alua_rtpg.c | 2 +- 9 files changed, 20 insertions(+), 17 deletions(-)
libmultipath/checkers/Makefile +3 -2
@@ -1,11 +1,12 @@ # # Copyright (C) 2003 Christophe Varoqui, <[email protected]> # +TOPDIR = ../.. include ../../Makefile.inc -CPPFLAGS += -I.. +CPPFLAGS += -I$(multipathdir) CFLAGS += $(LIB_CFLAGS) -LDFLAGS += -L.. -lmultipath +LDFLAGS += -L$(multipathdir) LIBDEPS = -lmultipath -laio -lpthread -lrt # If you add or remove a checker also update multipath/multipath.conf.5
libmultipath/checkers/directio.c +2 -2
@@ -15,8 +15,8 @@#include <libaio.h> #include "checkers.h" -#include "../libmultipath/debug.h" -#include "../libmultipath/time-util.h" +#include "debug.h" +#include "time-util.h" #define AIO_GROUP_SIZE 1024
libmultipath/checkers/emc_clariion.c +1 -1
@@ -11,7 +11,7 @@#include <sys/ioctl.h> #include <errno.h> -#include "../libmultipath/sg_include.h" +#include "sg_include.h" #include "libsg.h" #include "checkers.h" #include "debug.h"
libmultipath/checkers/hp_sw.c +2 -2
@@ -13,8 +13,8 @@#include "checkers.h" -#include "../libmultipath/sg_include.h" -#include "../libmultipath/unaligned.h" +#include "sg_include.h" +#include "unaligned.h" #define TUR_CMD_LEN 6#define INQUIRY_CMDLEN 6
libmultipath/checkers/rdac.c +1 -1
@@ -14,7 +14,7 @@#include "checkers.h" #include "debug.h" -#include "../libmultipath/sg_include.h" +#include "sg_include.h" #define INQUIRY_CMDLEN 6#define INQUIRY_CMD 0x12
libmultipath/checkers/tur.c +4 -4
@@ -19,10 +19,10 @@#include "checkers.h" -#include "../libmultipath/debug.h" -#include "../libmultipath/sg_include.h" -#include "../libmultipath/util.h" -#include "../libmultipath/time-util.h" +#include "debug.h" +#include "sg_include.h" +#include "util.h" +#include "time-util.h" #define TUR_CMD_LEN 6#define HEAVY_CHECK_COUNT 10
libmultipath/foreign/Makefile +2 -2
@@ -4,9 +4,9 @@ TOPDIR=../.. include ../../Makefile.inc -CPPFLAGS += -I.. -I$(nvmedir) +CPPFLAGS += -I$(multipathdir) -I$(nvmedir) CFLAGS += $(LIB_CFLAGS) -LDFLAGS += -L.. +LDFLAGS += -L$(multipathdir) LIBDEPS = -lmultipath -ludev -lpthread -lrt LIBS = libforeign-nvme.so
libmultipath/prioritizers/Makefile +4 -2
@@ -1,11 +1,13 @@ # # Copyright (C) 2007 Christophe Varoqui, <[email protected]> # +TOPDIR=../.. + include ../../Makefile.inc -CPPFLAGS += -I.. +CPPFLAGS += -I$(multipathdir) CFLAGS += $(LIB_CFLAGS) -LDFLAGS += -L.. +LDFLAGS += -L$(multipathdir) LIBDEPS = -lmultipath -lm -lpthread -lrt # If you add or remove a prioritizer also update multipath/multipath.conf.5
libmultipath/prioritizers/alua_rtpg.c +1 -1
@@ -27,7 +27,7 @@#include "../structs.h" #include "../prio.h" #include "../discovery.h" -#include "../debug.h" +#include "debug.h" #include "alua_rtpg.h" #define SENSE_BUFF_LEN 32
Signature · 6 lines
2.37.1 -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
PATCH v3 8/11 libmultipath: split off libmpathutil
In reply to [email protected]From: Martin Wilck <[email protected]>
Split libmultipath into two libraries: libmpathutil contains generic utilities that don't relate to device-mapper or multipath specifically. libmultipath retains multipath-specific code.
The reason for this change is that we'll create a small client program that takes over the role of "multipath -k", the interactive client. This way multipathd doesn't need to link against libreadline any more. The client only needs functionality from libmpathutil, which doesn't contain code that isn't compliant with GPL-3.0, and can thus be linked to libreadline without conflicts.
The new library contains weak implementations of {get,put}_multipath_config, which are meant to be superseded by libmultipath's implementation. In the interactive client, these functions aren't needed.
As we now have an ABI between libmpathutil and libmultipath, the ABI must be extended by adding functions from libmpathutil that are used internally by libmultipath.
---
Makefile | 4 +-
Makefile.inc | 1 +
libmpathpersist/Makefile | 6 +-
libmpathutil/Makefile | 70 +++++++++++
{libmultipath => libmpathutil}/debug.c | 0
{libmultipath => libmpathutil}/debug.h | 0
libmpathutil/globals.c | 12 ++
libmpathutil/globals.h | 39 ++++++
libmpathutil/libmpathutil.version | 122 +++++++++++++++++++
{libmultipath => libmpathutil}/log.c | 0
{libmultipath => libmpathutil}/log.h | 0
{libmultipath => libmpathutil}/log_pthread.c | 0
{libmultipath => libmpathutil}/log_pthread.h | 0
{libmultipath => libmpathutil}/parser.c | 0
{libmultipath => libmpathutil}/parser.h | 2 +-
{libmultipath => libmpathutil}/strbuf.c | 0
{libmultipath => libmpathutil}/strbuf.h | 0
{libmultipath => libmpathutil}/time-util.c | 0
{libmultipath => libmpathutil}/time-util.h | 0
{libmultipath => libmpathutil}/util.c | 0
{libmultipath => libmpathutil}/util.h | 0
{libmultipath => libmpathutil}/uxsock.c | 0
{libmultipath => libmpathutil}/uxsock.h | 0
{libmultipath => libmpathutil}/vector.c | 0
{libmultipath => libmpathutil}/vector.h | 0
libmpathvalid/Makefile | 6 +-
libmultipath/Makefile | 15 ++-
libmultipath/checkers/Makefile | 6 +-
libmultipath/config.h | 3 +-
libmultipath/foreign/Makefile | 6 +-
libmultipath/libmultipath.version | 41 -------
libmultipath/prioritizers/Makefile | 6 +-
mpathpersist/Makefile | 4 +-
multipath/Makefile | 6 +-
multipathd/Makefile | 12 +-
tests/Makefile | 12 +-
36 files changed, 289 insertions(+), 84 deletions(-)
create mode 100644 libmpathutil/Makefile
rename {libmultipath => libmpathutil}/debug.c (100%)
rename {libmultipath => libmpathutil}/debug.h (100%)
create mode 100644 libmpathutil/globals.c
create mode 100644 libmpathutil/globals.h
create mode 100644 libmpathutil/libmpathutil.version
rename {libmultipath => libmpathutil}/log.c (100%)
rename {libmultipath => libmpathutil}/log.h (100%)
rename {libmultipath => libmpathutil}/log_pthread.c (100%)
rename {libmultipath => libmpathutil}/log_pthread.h (100%)
rename {libmultipath => libmpathutil}/parser.c (100%)
rename {libmultipath => libmpathutil}/parser.h (99%)
rename {libmultipath => libmpathutil}/strbuf.c (100%)
rename {libmultipath => libmpathutil}/strbuf.h (100%)
rename {libmultipath => libmpathutil}/time-util.c (100%)
rename {libmultipath => libmpathutil}/time-util.h (100%)
rename {libmultipath => libmpathutil}/util.c (100%)
rename {libmultipath => libmpathutil}/util.h (100%)
rename {libmultipath => libmpathutil}/uxsock.c (100%)
rename {libmultipath => libmpathutil}/uxsock.h (100%)
rename {libmultipath => libmpathutil}/vector.c (100%)
rename {libmultipath => libmpathutil}/vector.h (100%)Makefile +3 -1
@@ -4,6 +4,7 @@ LIB_BUILDDIRS := \ libmpathcmd \ + libmpathutil \ libmultipath \ libmpathpersist \ libmpathvalid
@@ -72,7 +73,8 @@ compile_commands.json: Makefile Makefile.inc $(BUILDDIRS:=/Makefile) $(MAKE) clean bear -- $(MAKE) -libmultipath libdmmp: libmpathcmd +libmpathutil libdmmp: libmpathcmd +libmultipath: libmpathutil libmpathpersist libmpathvalid multipath multipathd: libmultipath libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath mpathpersist multipathd: libmpathpersist
Makefile.inc +1 -0
@@ -86,6 +86,7 @@ libudevdir = $(prefix)/$(SYSTEMDPATH)/udev udevrulesdir = $(libudevdir)/rules.d modulesloaddir = $(prefix)/$(SYSTEMDPATH)/modules-load.d multipathdir = $(TOPDIR)/libmultipath +mpathutildir = $(TOPDIR)/libmpathutil man8dir = $(prefix)/usr/share/man/man8 man5dir = $(prefix)/usr/share/man/man5 man3dir = $(prefix)/usr/share/man/man3
libmpathpersist/Makefile +3 -3
@@ -5,10 +5,10 @@ DEVLIB = libmpathpersist.so LIBS = $(DEVLIB).$(SONAME) VERSION_SCRIPT:= libmpathpersist.version -CFLAGS += $(LIB_CFLAGS) -I$(multipathdir) -I$(mpathpersistdir) -I$(mpathcmddir) -LDFLAGS += -L$(multipathdir) -L$(mpathcmddir) +CFLAGS += $(LIB_CFLAGS) -I$(multipathdir) -I$(mpathutildir) -I$(mpathpersistdir) -I$(mpathcmddir) +LDFLAGS += -L$(multipathdir) -L$(mpathutildir) -L$(mpathcmddir) -LIBDEPS += -lmultipath -lmpathcmd -ldevmapper -lpthread -ldl +LIBDEPS += -lmultipath -lmpathutil -lmpathcmd -ldevmapper -lpthread -ldl OBJS = mpath_persist.o mpath_updatepr.o mpath_pr_ioctl.o mpath_persist_int.o
libmpathutil/Makefile new file +70 -0
70 lines not on this page · raw message
libmpathutil/debug.c renamed from libmultipath/debug.c +0 -0
libmpathutil/debug.h renamed from libmultipath/debug.h +0 -0
libmpathutil/globals.c new file +12 -0
@@ -0,0 +1,12 @@ +#include <stddef.h> +#include <libudev.h> +#include "globals.h" + +struct udev __attribute__((weak)) *udev; +struct config __attribute__((weak)) *get_multipath_config (void ) +{ +return NULL ; +} + +void __attribute__((weak))put_multipath_config (void *p __attribute__((unused))) +{}
libmpathutil/globals.h new file +39 -0
@@ -0,0 +1,39 @@ +#ifndef _GLOBALS_H +#define _GLOBALS_H + +struct config ; + +/** +* extern variable: udev +* +* A &struct udev instance used by libmultipath. libmultipath expects +* a valid, initialized &struct udev in this variable. +* An application can define this variable itself, in which case +* the applications's instance will take precedence. +* The application can initialize and destroy this variable by +* calling libmultipath_init() and libmultipath_exit(), respectively, +* whether or not it defines the variable itself. +* An application can initialize udev with udev_new() before calling +* libmultipath_init(), e.g. if it has to make libudev calls before +* libmultipath calls. If an application wants to keep using the +* udev variable after calling libmultipath_exit(), it should have taken +* an additional reference on it beforehand. This is the case e.g. +* after initializing udev with udev_new(). +*/ +extern struct udev *udev; + +/* +* libmultipath provides default implementations of +* get_multipath_config() and put_multipath_config(). +* Applications using these should use init_config(file, NULL) +* to load the configuration, rather than load_config(file). +* Likewise, uninit_config() should be used for teardown, but +* using free_config() for that is supported, too. +* Applications can define their own {get,put}_multipath_config() +* functions, which override the library-internal ones, but +* could still call libmp_{get,put}_multipath_config(). +*/ +void put_multipath_config (void *); +struct config *get_multipath_config (void ); + +#endif
libmpathutil/libmpathutil.version new file +122 -0
122 lines not on this page · raw message
libmpathutil/log.c renamed from libmultipath/log.c +0 -0
libmpathutil/log.h renamed from libmultipath/log.h +0 -0
libmpathutil/log_pthread.c renamed from libmultipath/log_pthread.c +0 -0
libmpathutil/log_pthread.h renamed from libmultipath/log_pthread.h +0 -0
libmpathutil/parser.c renamed from libmultipath/parser.c +0 -0
libmpathutil/parser.h renamed from libmultipath/parser.h +1 -1
@@ -33,8 +33,8 @@/* local includes */ #include "vector.h" -#include "config.h" struct strbuf ; +struct config ;/* Global definitions */ #define EOB "}"
libmpathutil/strbuf.c renamed from libmultipath/strbuf.c +0 -0
libmpathutil/strbuf.h renamed from libmultipath/strbuf.h +0 -0
libmpathutil/time-util.c renamed from libmultipath/time-util.c +0 -0
libmpathutil/time-util.h renamed from libmultipath/time-util.h +0 -0
libmpathutil/util.c renamed from libmultipath/util.c +0 -0
libmpathutil/util.h renamed from libmultipath/util.h +0 -0
libmpathutil/uxsock.c renamed from libmultipath/uxsock.c +0 -0
libmpathutil/uxsock.h renamed from libmultipath/uxsock.h +0 -0
libmpathutil/vector.c renamed from libmultipath/vector.c +0 -0
libmpathutil/vector.h renamed from libmultipath/vector.h +0 -0
libmpathvalid/Makefile +3 -3
@@ -5,11 +5,11 @@ DEVLIB = libmpathvalid.so LIBS = $(DEVLIB).$(SONAME) VERSION_SCRIPT := libmpathvalid.version -CPPFLAGS += -I$(multipathdir) -I$(mpathcmddir) +CPPFLAGS += -I$(multipathdir) -I$(mpathutildir) -I$(mpathcmddir) CFLAGS += $(LIB_CFLAGS) -LIBDEPS += -lpthread -ldevmapper -ldl -L$(multipathdir) \ - -lmultipath -L$(mpathcmddir) -lmpathcmd -ludev +LIBDEPS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath \ + -L$(mpathutildir) -lmpathutil -L$(mpathcmddir) -lmpathcmd -ludev OBJS = mpath_valid.o
libmultipath/Makefile +7 -8
@@ -8,10 +8,10 @@ DEVLIB = libmultipath.so LIBS = $(DEVLIB).$(SONAME) VERSION_SCRIPT := libmultipath.version -CPPFLAGS += -I$(mpathcmddir) -I$(nvmedir) -D_GNU_SOURCE +CPPFLAGS += -I$(mpathutildir) -I$(mpathcmddir) -I$(nvmedir) -D_GNU_SOURCE CFLAGS += $(LIB_CFLAGS) -LIBDEPS += -lpthread -ldl -ldevmapper -ludev -L$(mpathcmddir) -lmpathcmd -lurcu -laio +LIBDEPS += -lpthread -ldl -ldevmapper -ludev -L$(mpathutildir) -lmpathutil -L$(mpathcmddir) -lmpathcmd -lurcu -laio ifdef SYSTEMD CPPFLAGS += -DUSE_SYSTEMD=$(SYSTEMD)
@@ -56,15 +56,14 @@ OBJS-U := prio.o checkers.o foreign.o config.o OBJS-T := $(patsubst %.o,%-test.o,$(OBJS-U)) # other object files -OBJS-O := parser.o vector.o devmapper.o \ - hwtable.o blacklist.o util.o dmparser.o \ +OBJS-O := devmapper.o hwtable.o blacklist.o dmparser.o \ structs.o discovery.o propsel.o dict.o \ - pgpolicies.o debug.o defaults.o uevent.o time-util.o \ - switchgroup.o uxsock.o print.o alias.o log_pthread.o \ - log.o configure.o structs_vec.o sysfs.o \ + pgpolicies.o defaults.o uevent.o \ + switchgroup.o print.o alias.o \ + configure.o structs_vec.o sysfs.o \ lock.o file.o wwids.o prioritizers/alua_rtpg.o prkey.o \ io_err_stat.o dm-generic.o generic.o nvme-lib.o \ - libsg.o valid.o strbuf.o + libsg.o valid.o OBJS := $(OBJS-O) $(OBJS-U)
libmultipath/checkers/Makefile +3 -3
@@ -4,10 +4,10 @@ TOPDIR = ../.. include ../../Makefile.inc -CPPFLAGS += -I$(multipathdir) +CPPFLAGS += -I$(multipathdir) -I$(mpathutildir) CFLAGS += $(LIB_CFLAGS) -LDFLAGS += -L$(multipathdir) -LIBDEPS = -lmultipath -laio -lpthread -lrt +LDFLAGS += -L$(multipathdir) -L$(mpathutildir) +LIBDEPS = -lmultipath -lmpathutil -laio -lpthread -lrt # If you add or remove a checker also update multipath/multipath.conf.5 LIBS= \
libmultipath/config.h +1 -2
@@ -6,6 +6,7 @@#include <urcu.h> #include <inttypes.h> #include "byteorder.h" +#include "globals.h" #define ORIGIN_DEFAULT 0#define ORIGIN_CONFIG 1
@@ -304,9 +305,7 @@ int init_config(const char *file);void uninit_config (void );struct config *libmp_get_multipath_config (void ); -struct config *get_multipath_config (void );void libmp_put_multipath_config (void *); -void put_multipath_config (void *);int parse_uid_attrs (char *uid_attrs,struct config *conf); const char *get_uid_attribute_by_attrs(const struct config *conf,
libmultipath/foreign/Makefile +3 -3
@@ -4,10 +4,10 @@ TOPDIR=../.. include ../../Makefile.inc -CPPFLAGS += -I$(multipathdir) -I$(nvmedir) +CPPFLAGS += -I$(multipathdir) -I$(mpathutildir) -I$(nvmedir) CFLAGS += $(LIB_CFLAGS) -LDFLAGS += -L$(multipathdir) -LIBDEPS = -lmultipath -ludev -lpthread -lrt +LDFLAGS += -L$(multipathdir) -L$(mpathutildir) +LIBDEPS = -lmultipath -lmpathutil -ludev -lpthread -lrt LIBS = libforeign-nvme.so
libmultipath/libmultipath.version +0 -41
143 lines not on this page · raw message
libmultipath/prioritizers/Makefile +3 -3
@@ -5,10 +5,10 @@ TOPDIR=../.. include ../../Makefile.inc -CPPFLAGS += -I$(multipathdir) +CPPFLAGS += -I$(multipathdir) -I$(mpathutildir) CFLAGS += $(LIB_CFLAGS) -LDFLAGS += -L$(multipathdir) -LIBDEPS = -lmultipath -lm -lpthread -lrt +LDFLAGS += -L$(multipathdir) -L$(mpathutildir) +LIBDEPS = -lmultipath -lmpathutil -lm -lpthread -lrt # If you add or remove a prioritizer also update multipath/multipath.conf.5 LIBS = \
mpathpersist/Makefile +2 -2
@@ -1,11 +1,11 @@ include ../Makefile.inc -CPPFLAGS += -I$(multipathdir) -I$(mpathpersistdir) +CPPFLAGS += -I$(multipathdir) -I$(mpathutildir) -I$(mpathpersistdir) CFLAGS += $(BIN_CFLAGS) LDFLAGS += $(BIN_LDFLAGS) LIBDEPS += -L$(mpathpersistdir) -lmpathpersist -L$(multipathdir) -lmultipath \ - -L$(mpathcmddir) -lmpathcmd -lpthread -ldevmapper -ludev + -L$(mpathutildir) -lmpathutil -L$(mpathcmddir) -lmpathcmd -lpthread -ldevmapper -ludev EXEC = mpathpersist
multipath/Makefile +3 -3
@@ -3,11 +3,11 @@ # include ../Makefile.inc -CPPFLAGS += -I$(multipathdir) -I$(mpathcmddir) +CPPFLAGS += -I$(multipathdir) -I$(mpathutildir) -I$(mpathcmddir) CFLAGS += $(BIN_CFLAGS) LDFLAGS += $(BIN_LDFLAGS) -LIBDEPS += -L$(multipathdir) -lmultipath -L$(mpathcmddir) -lmpathcmd \ - -lpthread -ldevmapper -ldl -ludev +LIBDEPS += -L$(multipathdir) -lmultipath -L$(mpathutildir) -lmpathutil \ + -L$(mpathcmddir) -lmpathcmd -lpthread -ldevmapper -ldl -ludev EXEC = multipath
multipathd/Makefile +7 -5
@@ -15,14 +15,16 @@ endif #CPPFLAGS += -D_DEBUG_ #CPPFLAGS += -DLOGDBG -CPPFLAGS += -I$(multipathdir) -I$(mpathpersistdir) -I$(mpathcmddir) -I$(thirdpartydir) \ +CPPFLAGS += -I$(multipathdir) -I$(mpathutildir) -I$(mpathpersistdir) -I$(mpathcmddir) -I$(thirdpartydir) \ $(shell $(PKGCONFIG) --modversion liburcu 2>/dev/null | \ awk -F. '{ printf("-DURCU_VERSION=0x%06x", 256 * ( 256 * $$1 + $$2) + $$3); }') CFLAGS += $(BIN_CFLAGS) LDFLAGS += $(BIN_LDFLAGS) + +CLI_LIBDEPS := -L$(mpathutildir) -lmpathutil -L$(mpathcmddir) -lmpathcmd -ludev -ldl -lurcu -lpthread LIBDEPS += -L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist \ - -L$(mpathcmddir) -lmpathcmd -ludev -ldl -lurcu -lpthread \ - -ldevmapper + -ldevmapper $(CLI_LIBDEPS) + ifeq ($(READLINE),libedit) CPPFLAGS += -DUSE_LIBEDIT
@@ -36,9 +38,9 @@ endif ifdef SYSTEMD CPPFLAGS += -DUSE_SYSTEMD=$(SYSTEMD) ifeq ($(shell test $(SYSTEMD) -gt 209 && echo 1), 1) - LIBDEPS += -lsystemd + CLI_LIBDEPS += -lsystemd else - LIBDEPS += -lsystemd-daemon + CLI_LIBDEPS += -lsystemd-daemon endif endif ifeq ($(ENABLE_DMEVENTS_POLL),0)
tests/Makefile +6 -6
@@ -11,9 +11,9 @@ TEST_MISSING_INITIALIZERS = $(shell \ || echo -Wno-missing-field-initializers) W_MISSING_INITIALIZERS := $(call TEST_MISSING_INITIALIZERS) -CPPFLAGS += -I$(multipathdir) -I$(mpathcmddir) -DTESTCONFDIR=\"$(TESTDIR)/conf.d\" +CPPFLAGS += -I$(multipathdir) -I$(mpathutildir) -I$(mpathcmddir) -DTESTCONFDIR=\"$(TESTDIR)/conf.d\" CFLAGS += $(BIN_CFLAGS) -Wno-unused-parameter $(W_MISSING_INITIALIZERS) -LIBDEPS += -L. -L$(mpathcmddir) -lmultipath -lmpathcmd -lcmocka +LIBDEPS += -L. -L $(mpathutildir) -L$(mpathcmddir) -lmultipath -lmpathutil -lmpathcmd -lcmocka TESTS := uevent parser util dmevents hwtable blacklist unaligned vpd pgpolicy \ alias directio valid devt mpathvalid strbuf sysfs
@@ -69,9 +69,9 @@ mpathvalid-test_OBJDEPS := ../libmpathvalid/mpath_valid.o ifneq ($(DIO_TEST_DEV),) directio-test_LIBDEPS := -laio endif -strbuf-test_OBJDEPS := ../libmultipath/strbuf.o +strbuf-test_OBJDEPS := ../libmpathutil/strbuf.o sysfs-test_TESTDEPS := test-log.o -sysfs-test_OBJDEPS := ../libmultipath/sysfs.o ../libmultipath/util.o +sysfs-test_OBJDEPS := ../libmultipath/sysfs.o ../libmpathutil/util.o sysfs-test_LIBDEPS := -ludev -lpthread -ldl %.o: %.c
@@ -83,11 +83,11 @@ lib/libchecktur.so: %.out: %-test lib/libchecktur.so @echo == running $< == - @LD_LIBRARY_PATH=.:$(mpathcmddir) ./$< >$@ + @LD_LIBRARY_PATH=.:$(mpathutildir):$(mpathcmddir) ./$< >$@ %.vgr: %-test lib/libchecktur.so @echo == running valgrind for $< == - @LD_LIBRARY_PATH=.:$(mpathcmddir) \ + @LD_LIBRARY_PATH=.:$(mpathutildir):$(mpathcmddir) \ valgrind --leak-check=full --error-exitcode=128 ./$< >$@ 2>&1 OBJS = $(TESTS:%=%.o) $(HELPERS)
Signature · 6 lines
2.37.1 -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
Quoted 4 lines · On Mon, Aug 22, 2022 at 11:22:49PM +0200, [email protected] wrote:
From: Martin Wilck <[email protected]>
The CI found a few more glitches in my v2 patch set. Not reposting the entire set here, just the changed patches.
For all except 01/11 & 10/11:
Quoted 90 lines
Changes
v2->v3:
fix compilation errors on Alpine an CI errors.Hannes Reinecke (1):
multipathd: replace libreadline withgetline()Martin Wilck (10):
.gitignore: ignore generated ABI files
libmultipath: move all reservation key functions toprkey.c
libmultipath: always set_GNU_SOURCE
multipath-tools:Makefile: fix dependencies for "install" target libmultipath checkers/prioritizers: search for includes in
libmultipath
libmultipath: remove weak attribute for {get,put}_multipath_config
libmultipath: split off libmpathutil
multipathc: add new interactive client program
multipathd: exec multipathc in interactive mode
multipathd: fix incompatible pointer type error with libedit.gitignore | 3 + Makefile | 8 +- Makefile.inc | 5 +- libmpathpersist/Makefile | 6 +- libmpathutil/Makefile | 70 +++++ {libmultipath => libmpathutil}/debug.c | 0 {libmultipath => libmpathutil}/debug.h | 0 libmpathutil/globals.c | 12 + libmpathutil/globals.h | 39 +++ libmpathutil/libmpathutil.version | 122 +++++++++ {libmultipath => libmpathutil}/log.c | 0 {libmultipath => libmpathutil}/log.h | 0 {libmultipath => libmpathutil}/log_pthread.c | 0 {libmultipath => libmpathutil}/log_pthread.h | 0 {libmultipath => libmpathutil}/parser.c | 0 {libmultipath => libmpathutil}/parser.h | 2 +- {libmultipath => libmpathutil}/strbuf.c | 0 {libmultipath => libmpathutil}/strbuf.h | 0 {libmultipath => libmpathutil}/time-util.c | 0 {libmultipath => libmpathutil}/time-util.h | 0 {libmultipath => libmpathutil}/util.c | 32 --- {libmultipath => libmpathutil}/util.h | 2 - {libmultipath => libmpathutil}/uxsock.c | 0 {libmultipath => libmpathutil}/uxsock.h | 0 {libmultipath => libmpathutil}/vector.c | 0 {libmultipath => libmpathutil}/vector.h | 0 libmpathvalid/Makefile | 6 +- libmultipath/Makefile | 17 +- libmultipath/checkers/Makefile | 7 +- libmultipath/checkers/directio.c | 4 +- libmultipath/checkers/emc_clariion.c | 2 +- libmultipath/checkers/hp_sw.c | 4 +- libmultipath/checkers/rdac.c | 2 +- libmultipath/checkers/tur.c | 8 +- libmultipath/config.c | 4 +- libmultipath/config.h | 14 +- libmultipath/dict.c | 16 +- libmultipath/dict.h | 2 - libmultipath/foreign/Makefile | 6 +- libmultipath/libmultipath.version | 41 --- libmultipath/prioritizers/Makefile | 8 +- libmultipath/prioritizers/alua_rtpg.c | 2 +- libmultipath/prkey.c | 49 +++- libmultipath/prkey.h | 3 + mpathpersist/Makefile | 4 +- multipath/Makefile | 6 +- multipathd/Makefile | 43 ++- multipathd/cli.c | 128 +-------- multipathd/cli.h | 5 +- multipathd/main.c | 15 +- multipathd/multipathc.c | 271 +++++++++++++++++++ multipathd/uxclnt.c | 108 +------- tests/Makefile | 12 +- 53 files changed, 693 insertions(+), 395 deletions(-) create mode 100644 libmpathutil/Makefile rename {libmultipath => libmpathutil}/debug.c (100%) rename {libmultipath => libmpathutil}/debug.h (100%) create mode 100644 libmpathutil/globals.c create mode 100644 libmpathutil/globals.h create mode 100644 libmpathutil/libmpathutil.version rename {libmultipath => libmpathutil}/log.c (100%) rename {libmultipath => libmpathutil}/log.h (100%) rename {libmultipath => libmpathutil}/log_pthread.c (100%) rename {libmultipath => libmpathutil}/log_pthread.h (100%) rename {libmultipath => libmpathutil}/parser.c (100%) rename {libmultipath => libmpathutil}/parser.h (99%) rename {libmultipath => libmpathutil}/strbuf.c (100%) rename {libmultipath => libmpathutil}/strbuf.h (100%) rename {libmultipath => libmpathutil}/time-util.c (100%)
Quoted 11 lines
rename {libmultipath => libmpathutil}/time-util.h (100%) rename {libmultipath => libmpathutil}/util.c (92%) rename {libmultipath => libmpathutil}/util.h (96%) rename {libmultipath => libmpathutil}/uxsock.c (100%) rename {libmultipath => libmpathutil}/uxsock.h (100%) rename {libmultipath => libmpathutil}/vector.c (100%) rename {libmultipath => libmpathutil}/vector.h (100%) create mode 100644 multipathd/multipathc.cSignature · 1 line
2.37.1
--
dm-devel mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/dm-devel