performancecopilot · sfeifer · Feb 26, 2026 · Feb 25, 2026
diff --git a/src/GNUmakefile b/src/GNUmakefile
@@ -31,6 +31,7 @@ LIBS_SUBDIRS = \
 	libpcp_qed \
 	libpcp_qmc \
 	libpcp_qwt \
+	libvalkey \
 	libpcp_web \
 	libpcp_fault \
 	#

diff --git a/src/libpcp_web/src/GNUmakefile b/src/libpcp_web/src/GNUmakefile
@@ -26,36 +26,26 @@ else
 INIH_XFILES =
 endif
 
-LIBVALKEY_HFILES = $(addprefix deps/libvalkey/, \
-	include/valkey/alloc.h include/valkey/async.h src/async_private.h src/fmacros.h include/valkey/valkey.h include/valkey/net.h \
-	include/valkey/read.h include/valkey/visibility.h src/sds.h src/sdsalloc.h include/valkey/sockcompat.h src/win32.h include/valkey/adapters/libuv.h \
-	src/adlist.h src/command.h src/vkutil.h include/valkey/cluster.h src/valkey_private.h src/cmddef.h src/dict.h)
-LIBVALKEY_CFILES = $(addprefix deps/libvalkey/, \
-	src/alloc.c src/async.c src/valkey.c src/net.c src/sds.c src/sockcompat.c src/read.c \
-	src/adlist.c src/command.c src/crc16.c src/vkutil.c src/cluster.c src/conn.c src/dict.c)
-LIBVALKEY_XFILES = $(LIBVALKEY_HFILES) $(LIBVALKEY_CFILES)
-
 CFILES = jsmn.c http_client.c http_parser.c siphash.c \
 	 query.c schema.c load.c sha1.c util.c slots.c \
 	 keys.c maps.c batons.c encoding.c \
-	 search.c json_helpers.c config.c \
-	 $(LIBVALKEY_CFILES)
+	 search.c json_helpers.c config.c
 ifneq "$(HAVE_LIBINIH)" "true"
 	 CFILES += $(INIH_CFILES)
 endif
 HFILES = jsmn.h http_client.h http_parser.h zmalloc.h \
 	 query.h schema.h load.h sha1.h util.h slots.h \
 	 keys.h maps.h batons.h encoding.h \
-	 search.h discover.h private.h \
-	 $(LIBVALKEY_HFILES)
+	 search.h discover.h private.h
 ifneq "$(HAVE_LIBINIH)" "true"
 	 HFILES += $(INIH_HFILES)
 endif
 YFILES = query_parser.y
 XFILES = jsmn.c jsmn.h http_parser.c http_parser.h \
 	 sha1.c sha1.h siphash.c
 
-LLDLIBS = $(PCPWEBLIB_EXTRAS) $(LIB_FOR_MATH) $(LIB_FOR_REGEX)
+LLDLIBS = $(PCPWEBLIB_EXTRAS) $(LIB_FOR_MATH) $(LIB_FOR_REGEX) \
+	  $(TOPDIR)/src/libvalkey/src/libvalkey.a
 ifeq "$(TARGET_OS)" "mingw"
 LLDLIBS += -lws2_32
 CFILES += fnmatch.c
@@ -67,7 +57,9 @@ ifneq "$(HAVE_LIBINIH)" "true"
 LCFLAGS += -Iinih
 endif
 
-LCFLAGS += $(C99_CFLAGS) -DJSMN_PARENT_LINKS=1 -DJSMN_STRICT=1 -DHTTP_PARSER_STRICT=0 -Ideps -Ideps/libvalkey/include/valkey -Ideps/libvalkey/include -Ideps/libvalkey/src
+LCFLAGS += $(C99_CFLAGS) -DJSMN_PARENT_LINKS=1 -DJSMN_STRICT=1 -DHTTP_PARSER_STRICT=0 -Ideps \
+	   -I$(TOPDIR)/vendor/github.com/valkey-io/libvalkey/include \
+	   -I$(TOPDIR)/vendor/github.com/valkey-io/libvalkey/src
 
 ifeq "$(HAVE_LIBUV)" "true"
 CFILES += discover.c loggroup.c webgroup.c timer.c
@@ -108,13 +100,13 @@ SYMTARGET =
 endif
 
 VERSION_SCRIPT = exports
-LDIRT = $(XFILES) $(YFILES) $(LIBVALKEY_XFILES) $(SYMTARGET) \
+LDIRT = $(XFILES) $(YFILES) $(SYMTARGET) \
 	$(YFILES:%.y=%.tab.?) exports
 ifneq "$(HAVE_LIBINIH)" "true"
 	LDIRT += $(INIH_XFILES)
 endif
 
-default: $(XFILES) $(LIBVALKEY_XFILES) $(INIH_XFILES) $(LIBTARGET) $(SYMTARGET) $(STATICLIBTARGET)
+default: $(XFILES) $(INIH_XFILES) $(LIBTARGET) $(SYMTARGET) $(STATICLIBTARGET)
 
 include $(BUILDRULES)
 
@@ -144,10 +136,6 @@ $(INIH_XFILES):
 	mkdir -p deps/inih
 	$(LN_S) -f $(realpath $(TOPDIR))/vendor/github.com/benhoyt/$(@:deps/%=%) $@
 endif
-$(LIBVALKEY_XFILES):
-	mkdir -p deps/libvalkey/include/valkey/adapters
-	mkdir -p deps/libvalkey/src
-	$(LN_S) -f $(realpath $(TOPDIR))/vendor/github.com/valkey-io/$(@:deps/%=%) $@
 
 .NOTPARALLEL:
 query_parser.tab.h query_parser.tab.c: query_parser.y query.h
@@ -161,10 +149,10 @@ default_pcp:	default
 install_pcp:	install
 
 ifneq ($(LIBTARGET),)
-$(LIBTARGET): $(VERSION_SCRIPT) $(XFILES) $(LIBVALKEY_XFILES) $(INIH_XFILES)
+$(LIBTARGET): $(VERSION_SCRIPT) $(XFILES) $(INIH_XFILES)
 endif
 
-%.o: $(LIBVALKEY_XFILES) $(INIH_XFILES)
+%.o: $(INIH_XFILES)
 
 jsmn.o:		jsmn.c jsmn.h
 discover.o:	discover.h discover.c

diff --git a/src/libvalkey/GNUmakefile b/src/libvalkey/GNUmakefile
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2026 Red Hat.
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
+#
+
+# libvalkey.a - vendored Valkey (Redis-compatible) C client library
+
+TOPDIR = ../..
+
+include $(TOPDIR)/src/include/builddefs
+
+SUBDIRS = src
+
+default install: $(SUBDIRS)
+	$(SUBDIRS_MAKERULE)
+
+include $(BUILDRULES)
+
+default_pcp: default
+
+install_pcp: install
diff --git a/src/libvalkey/src/GNUmakefile b/src/libvalkey/src/GNUmakefile
@@ -0,0 +1,58 @@
+#
+# Copyright (c) 2026 Red Hat.
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
+#
+
+TOPDIR = ../../..
+include $(TOPDIR)/src/include/builddefs
+
+LIBVALKEY_HFILES = $(addprefix deps/libvalkey/, \
+	include/valkey/alloc.h include/valkey/async.h include/valkey/cluster.h \
+	include/valkey/valkey.h include/valkey/net.h include/valkey/read.h \
+	include/valkey/visibility.h include/valkey/sockcompat.h \
+	include/valkey/adapters/libuv.h \
+	src/adlist.h src/async_private.h src/cmddef.h src/command.h src/dict.h \
+	src/fmacros.h src/sds.h src/sdsalloc.h src/valkey_private.h \
+	src/vkutil.h src/win32.h)
+LIBVALKEY_CFILES = $(addprefix deps/libvalkey/, \
+	src/adlist.c src/alloc.c src/async.c src/cluster.c src/command.c \
+	src/conn.c src/crc16.c src/dict.c src/net.c src/read.c src/sds.c \
+	src/sockcompat.c src/valkey.c src/vkutil.c)
+LIBVALKEY_XFILES = $(LIBVALKEY_HFILES) $(LIBVALKEY_CFILES)
+
+CFILES = $(LIBVALKEY_CFILES)
+
+STATICLIBTARGET = libvalkey.a
+
+LCFLAGS = -U_GNU_SOURCE -Ideps -Ideps/libvalkey/include/valkey \
+	  -Ideps/libvalkey/include -Ideps/libvalkey/src
+
+LDIRT = $(LIBVALKEY_XFILES)
+
+default: $(LIBVALKEY_XFILES) $(STATICLIBTARGET)
+
+include $(BUILDRULES)
+
+deps/libvalkey/include/valkey/adapters deps/libvalkey/include/valkey deps/libvalkey/src:
+	mkdir -p $@
+
+$(LIBVALKEY_XFILES): | deps/libvalkey/include/valkey/adapters deps/libvalkey/include/valkey deps/libvalkey/src
+	$(LN_S) -f $(realpath $(TOPDIR))/vendor/github.com/valkey-io/$(@:deps/%=%) $@
+
+%.o: $(LIBVALKEY_XFILES)
+
+install: default
+	$(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+
+default_pcp: default
+
+install_pcp: install
diff --git a/src/pmdas/valkey/GNUmakefile b/src/pmdas/valkey/GNUmakefile
@@ -21,39 +21,22 @@ CMDTARGET	= pmdavalkey$(EXECSUFFIX)
 DFILES		= README help
 CONFIG		= valkey.conf
 
-LIBVALKEY_HFILES = $(addprefix deps/libvalkey/, \
-	include/valkey/alloc.h include/valkey/async.h include/valkey/cluster.h \
-	include/valkey/valkey.h include/valkey/net.h include/valkey/read.h \
-	include/valkey/visibility.h include/valkey/sockcompat.h src/adlist.h \
-	src/async_private.h src/cmddef.h src/command.h src/dict.h src/fmacros.h \
-	src/sds.h src/sdsalloc.h src/valkey_private.h src/vkutil.h src/win32.h)
-LIBVALKEY_CFILES = $(addprefix deps/libvalkey/, \
-	src/adlist.c src/alloc.c src/async.c src/cluster.c src/command.c \
-	src/conn.c src/crc16.c src/dict.c src/net.c src/read.c src/sds.c \
-	src/sockcompat.c src/valkey.c src/vkutil.c)
-LIBVALKEY_XFILES = $(LIBVALKEY_HFILES) $(LIBVALKEY_CFILES)
+CFILES		= pmdavalkey.c
 
-CFILES		= pmdavalkey.c $(LIBVALKEY_CFILES)
-
-LLDLIBS		= $(PCP_PMDALIB)
-LCFLAGS		= -I. -Ideps/libvalkey/include/valkey -Ideps/libvalkey/include -Ideps/libvalkey/src
+LLDLIBS		= $(PCP_PMDALIB) $(TOPDIR)/src/libvalkey/src/libvalkey.a
+LCFLAGS		= -I. -I$(TOPDIR)/vendor/github.com/valkey-io/libvalkey/include \
+		  -I$(TOPDIR)/vendor/github.com/valkey-io/libvalkey/src
 
 PMDATMPDIR	= $(PCP_PMDAS_DIR)/$(IAM)
 PMDACONFIG	= $(PCP_SYSCONF_DIR)/$(IAM)
 PMDAADMDIR	= $(PCP_PMDASADM_DIR)/$(IAM)
 
-LDIRT		= domain.h *.o $(IAM).log pmda$(IAM) pmda_$(IAM).$(DSOSUFFIX) $(LIBVALKEY_XFILES)
+LDIRT		= domain.h *.o $(IAM).log pmda$(IAM) pmda_$(IAM).$(DSOSUFFIX)
 
-default_pcp default:	$(LIBVALKEY_XFILES) $(CMDTARGET)
+default_pcp default:	$(CMDTARGET)
 
 include $(BUILDRULES)
 
-deps/libvalkey/include/valkey deps/libvalkey/src:
-	mkdir -p $@
-
-$(LIBVALKEY_XFILES): | deps/libvalkey/include/valkey deps/libvalkey/src
-	$(LN_S) -f $(realpath $(TOPDIR))/vendor/github.com/valkey-io/$(@:deps/%=%) $@
-
 install_pcp install:	default
 	$(INSTALL) -m 755 -d $(PMDAADMDIR)
 	$(INSTALL) -m 755 -d $(PMDATMPDIR)
@@ -69,8 +52,6 @@ $(OBJECTS): domain.h
 domain.h: ../../pmns/stdpmid
 	$(DOMAIN_MAKERULE)
 
-%.o: $(LIBVALKEY_XFILES)
-
 pmdavalkey.o: pmdavalkey.c domain.h
 
 default_pcp : default