Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package irqbalance for openSUSE:Factory
checked in at 2021-08-16 10:08:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/irqbalance (Old)
and /work/SRC/openSUSE:Factory/.irqbalance.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "irqbalance"
Mon Aug 16 10:08:49 2021 rev:60 rq:911416 version:1.8.0.14.ga7f8148
Changes:
--------
--- /work/SRC/openSUSE:Factory/irqbalance/irqbalance.changes 2021-07-21
19:07:24.687399030 +0200
+++ /work/SRC/openSUSE:Factory/.irqbalance.new.1899/irqbalance.changes
2021-08-16 10:13:33.198958845 +0200
@@ -1,0 +2,9 @@
+Wed Aug 11 10:16:57 UTC 2021 - tr...@suse.de
+
+- Update to version 1.8.0.14.ga7f8148:
+ * irqbalance: Check validity of numa_node
+ * configure.ac: use pkg-config to find numa
+ * Disable the communication socket when UI is disabled
+- Use %{?systemd_ordering} instead of %{?systemd_requires}
+
+-------------------------------------------------------------------
Old:
----
irqbalance-1.8.0.8.gbd5aaf5.obscpio
New:
----
irqbalance-1.8.0.14.ga7f8148.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ irqbalance.spec ++++++
--- /var/tmp/diff_new_pack.YrwoQx/_old 2021-08-16 10:13:33.722958177 +0200
+++ /var/tmp/diff_new_pack.YrwoQx/_new 2021-08-16 10:13:33.722958177 +0200
@@ -21,7 +21,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: irqbalance
-Version: 1.8.0.8.gbd5aaf5
+Version: 1.8.0.14.ga7f8148
Release: 0
Summary: Daemon to balance IRQs on SMP machines
License: GPL-2.0-or-later
@@ -35,12 +35,11 @@
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
-BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(glib-2.0)
Requires(pre): %fillup_prereq
Recommends: %{name}-ui
ExcludeArch: s390 s390x
-%{?systemd_requires}
+%{?systemd_ordering}
%ifnarch %{arm}
BuildRequires: libnuma-devel
%endif
++++++ irqbalance-1.8.0.8.gbd5aaf5.obscpio ->
irqbalance-1.8.0.14.ga7f8148.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/irqbalance-1.8.0.8.gbd5aaf5/.gitignore
new/irqbalance-1.8.0.14.ga7f8148/.gitignore
--- old/irqbalance-1.8.0.8.gbd5aaf5/.gitignore 1970-01-01 01:00:00.000000000
+0100
+++ new/irqbalance-1.8.0.14.ga7f8148/.gitignore 2021-08-06 20:09:49.000000000
+0200
@@ -0,0 +1,36 @@
+*.a
+*.o
+*~
+
+.deps
+
+*.diff
+*.patch
+*.orig
+*.rej
+
+/INSTALL
+/Makefile
+/Makefile.in
+*/Makefile
+*/Makefile.in
+/aclocal.m4
+/autom4te.cache
+/compile
+/config.guess
+/config.h
+/config.h.in
+/config.log
+/config.status
+/config.sub
+/configure
+/install-sh
+/libtool
+/ltmain.sh
+/m4
+/missing
+/stamp-h1
+/depcomp
+
+/irqbalance
+irqbalance-*.tar.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/irqbalance-1.8.0.8.gbd5aaf5/Makefile.am
new/irqbalance-1.8.0.14.ga7f8148/Makefile.am
--- old/irqbalance-1.8.0.8.gbd5aaf5/Makefile.am 2021-05-17 13:42:11.000000000
+0200
+++ new/irqbalance-1.8.0.14.ga7f8148/Makefile.am 2021-08-06
20:09:49.000000000 +0200
@@ -27,7 +27,7 @@
SUBDIRS = tests
UI_DIR = ui
-AM_CFLAGS = $(LIBCAP_NG_CFLAGS) $(GLIB2_CFLAGS)
+AM_CFLAGS = $(LIBCAP_NG_CFLAGS) $(GLIB2_CFLAGS) $(NUMA_CFLAGS)
AM_CPPFLAGS = -I${top_srcdir} -W -Wall -Wshadow -Wformat -Wundef -D_GNU_SOURCE
noinst_HEADERS = bitmap.h constants.h cpumask.h irqbalance.h non-atomic.h \
types.h $(UI_DIR)/helpers.h $(UI_DIR)/irqbalance-ui.h $(UI_DIR)/ui.h
@@ -39,11 +39,11 @@
irqbalance_SOURCES = activate.c bitmap.c classify.c cputree.c irqbalance.c \
irqlist.c numa.c placement.c procinterrupts.c
-irqbalance_LDADD = $(LIBCAP_NG_LIBS) $(GLIB2_LIBS)
+irqbalance_LDADD = $(LIBCAP_NG_LIBS) $(GLIB2_LIBS) $(NUMA_LIBS)
if IRQBALANCEUI
irqbalance_ui_SOURCES = $(UI_DIR)/helpers.c $(UI_DIR)/irqbalance-ui.c \
$(UI_DIR)/ui.c
-irqbalance_ui_LDADD = $(GLIB2_LIBS) $(CURSES_LIBS)
+irqbalance_ui_LDADD = $(GLIB2_LIBS) $(NUMA_LIBS) $(CURSES_LIBS)
endif
dist_man_MANS = irqbalance.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/irqbalance-1.8.0.8.gbd5aaf5/classify.c
new/irqbalance-1.8.0.14.ga7f8148/classify.c
--- old/irqbalance-1.8.0.8.gbd5aaf5/classify.c 2021-05-17 13:42:11.000000000
+0200
+++ new/irqbalance-1.8.0.14.ga7f8148/classify.c 2021-08-06 20:09:49.000000000
+0200
@@ -376,6 +376,11 @@
else
new->numa_node = get_numa_node(numa_node);
+ if (!new->numa_node) {
+ log(TO_CONSOLE, LOG_WARNING, "IRQ %d has an unknown node\n",
irq);
+ new->numa_node = get_numa_node(NUMA_NO_NODE);
+ }
+
cpus_setall(new->cpumask);
if (devpath != NULL) {
sprintf(path, "%s/local_cpus", devpath);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/irqbalance-1.8.0.8.gbd5aaf5/configure.ac
new/irqbalance-1.8.0.14.ga7f8148/configure.ac
--- old/irqbalance-1.8.0.8.gbd5aaf5/configure.ac 2021-05-17
13:42:11.000000000 +0200
+++ new/irqbalance-1.8.0.14.ga7f8148/configure.ac 2021-08-06
20:09:49.000000000 +0200
@@ -23,7 +23,7 @@
AC_CHECK_FUNCS(getopt_long)
-AC_CHECK_LIB(numa, numa_available)
+PKG_CHECK_MODULES([NUMA], [numa], [has_numa=yes], [AC_CHECK_LIB(numa,
numa_available)])
AC_CHECK_LIB(m, floor)
PKG_CHECK_MODULES([GLIB2], [glib-2.0], [], [AC_MSG_ERROR([glib-2.0 is
required])])
@@ -41,10 +41,13 @@
AM_PROG_CC_C_O
AC_ARG_WITH([irqbalance-ui],
- [AC_HELP_STRING([--without-irqbalance-ui],
- [Dont build the irqbalance ui component])],
- [with_irqbalanceui=$withval], [with_irqbalanceui=yes])
-
+ [AS_HELP_STRING([--without-irqbalance-ui],
+ [Dont build the irqbalance ui component])],
+ [with_irqbalanceui=$withval], [with_irqbalanceui=yes])
+AS_IF(
+ [test "x$with_irqbalanceui" = "xyes"], [
+ AC_DEFINE([HAVE_IRQBALANCEUI], 1, [Build irqbalance ui component.])
+])
AM_CONDITIONAL([IRQBALANCEUI], [test x$with_irqbalanceui = xyes])
AC_ARG_WITH([systemd],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/irqbalance-1.8.0.8.gbd5aaf5/cputree.c
new/irqbalance-1.8.0.14.ga7f8148/cputree.c
--- old/irqbalance-1.8.0.8.gbd5aaf5/cputree.c 2021-05-17 13:42:11.000000000
+0200
+++ new/irqbalance-1.8.0.14.ga7f8148/cputree.c 2021-08-06 20:09:49.000000000
+0200
@@ -39,7 +39,9 @@
#include "irqbalance.h"
+#ifdef HAVE_IRQBALANCEUI
extern char *banned_cpumask_from_ui;
+#endif
extern char *cpu_ban_string;
GList *cpus;
@@ -113,12 +115,14 @@
cpumask_t isolated_cpus;
char *env = NULL;
+#ifdef HAVE_IRQBALANCEUI
/* A manually specified cpumask overrides auto-detection. */
if (cpu_ban_string != NULL && banned_cpumask_from_ui != NULL) {
cpulist_parse(banned_cpumask_from_ui,
strlen(banned_cpumask_from_ui), banned_cpus);
goto out;
}
+#endif
/*
* Notes:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/irqbalance-1.8.0.8.gbd5aaf5/irqbalance.c
new/irqbalance-1.8.0.14.ga7f8148/irqbalance.c
--- old/irqbalance-1.8.0.8.gbd5aaf5/irqbalance.c 2021-05-17
13:42:11.000000000 +0200
+++ new/irqbalance-1.8.0.14.ga7f8148/irqbalance.c 2021-08-06
20:09:49.000000000 +0200
@@ -31,22 +31,21 @@
#include <time.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/un.h>
#include <fcntl.h>
#include <inttypes.h>
#ifdef HAVE_GETOPT_LONG
#include <getopt.h>
#endif
-
#ifdef HAVE_LIBCAP_NG
#include <cap-ng.h>
#endif
+#ifdef HAVE_IRQBALANCEUI
+#include <sys/un.h>
+#include <sys/socket.h>
+#endif
#include "irqbalance.h"
volatile int keep_going = 1;
-int socket_fd;
-char socket_name[64];
int one_shot_mode;
int debug_mode;
int foreground_mode;
@@ -67,9 +66,14 @@
GMainLoop *main_loop;
char *cpu_ban_string = NULL;
-char *banned_cpumask_from_ui = NULL;
unsigned long migrate_ratio = 0;
+#ifdef HAVE_IRQBALANCEUI
+int socket_fd;
+char socket_name[64];
+char *banned_cpumask_from_ui = NULL;
+#endif
+
static void sleep_approx(int seconds)
{
struct timespec ts;
@@ -405,6 +409,7 @@
}
}
+#ifdef HAVE_IRQBALANCEUI
gboolean sock_handle(gint fd, GIOCondition condition, gpointer user_data
__attribute__((unused)))
{
char buff[500];
@@ -585,6 +590,7 @@
g_unix_fd_add(socket_fd, G_IO_IN, sock_handle, NULL);
return 0;
}
+#endif
int main(int argc, char** argv)
{
@@ -688,10 +694,12 @@
parse_proc_interrupts();
parse_proc_stat();
+#ifdef HAVE_IRQBALANCEUI
if (init_socket()) {
ret = EXIT_FAILURE;
goto out;
}
+#endif
main_loop = g_main_loop_new(NULL, FALSE);
last_interval = sleep_interval;
g_timeout_add_seconds(sleep_interval, scan, NULL);
@@ -707,11 +715,12 @@
/* Remove pidfile */
if (!foreground_mode && pidfile)
unlink(pidfile);
+#ifdef HAVE_IRQBALANCEUI
/* Remove socket */
if (socket_fd > 0)
close(socket_fd);
if (socket_name[0])
unlink(socket_name);
-
+#endif
return ret;
}
++++++ irqbalance.obsinfo ++++++
--- /var/tmp/diff_new_pack.YrwoQx/_old 2021-08-16 10:13:33.846958018 +0200
+++ /var/tmp/diff_new_pack.YrwoQx/_new 2021-08-16 10:13:33.850958013 +0200
@@ -1,5 +1,5 @@
name: irqbalance
-version: 1.8.0.8.gbd5aaf5
-mtime: 1621251731
-commit: bd5aaf5a8613c8eadfbf9f0908fd8260125aae28
+version: 1.8.0.14.ga7f8148
+mtime: 1628273389
+commit: a7f81483a95a94d6a62ca7fb999a090e01c0de9b
