tools/nut-scanner/nut-scanner.c, tools/nut-scanner/Makefile.am: PoC using setproctag() [networkupstools#3302, networkupstools#3368]

Did not work for parallel scanning threads where it would be most useful,
because they are in same process space...

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Author: jimklimov

tools/nut-scanner/Makefile.am

@@ -151,7 +151,7 @@ libnutscan_la_LDFLAGS += -version-info 5:0:1
 # copies of "nut_debug_level" making fun of our debug-logging attempts.
 # One solution to tackle if needed for those cases would be to make some
 # dynamic/shared libnutcommon (etc.)
-libnutscan_la_LDFLAGS += -export-symbols-regex '^(nutscan_|nut_debug_level|s_upsdebug|fatalx|fatal_with_errno|xcalloc|xbasename|snprintfcat|snprintf_dynamic|max_threads|curr_threads|nut_report_config_flags|upsdebugx_report_search_paths|nut_prepare_search_paths|print_banner_once|suggest_doc_links)'
+libnutscan_la_LDFLAGS += -export-symbols-regex '^(nutscan_|nut_debug_level|s_upsdebug|fatalx|fatal_with_errno|setproctag|xcalloc|xbasename|snprintfcat|snprintf_dynamic|max_threads|curr_threads|nut_report_config_flags|upsdebugx_report_search_paths|nut_prepare_search_paths|print_banner_once|suggest_doc_links)'
 libnutscan_la_CFLAGS = \
 			-I$(top_builddir)/clients -I$(top_srcdir)/clients \
 			-I$(top_builddir)/include -I$(top_srcdir)/include \

tools/nut-scanner/nut-scanner.c

@@ -1230,6 +1230,8 @@ int main(int argc, char *argv[])
 	}
 #endif	/* HAVE_PTHREAD && ( HAVE_PTHREAD_TRYJOIN || HAVE_SEMAPHORE_UNNAMED || HAVE_SEMAPHORE_NAMED ) && HAVE_SYS_RESOURCE_H */
 
+	setproctag(progname);
+
 	memset(&snmp_sec, 0, sizeof(snmp_sec));
 	memset(&ipmi_sec, 0, sizeof(ipmi_sec));
 	memset(&xml_sec, 0, sizeof(xml_sec));
@@ -1724,6 +1726,7 @@ int main(int argc, char *argv[])
  * during build also serve as a fallback for pthread failure at runtime?
  */
 	if (allow_usb && nutscan_avail_usb) {
+		setproctag("usb");
 		upsdebugx(quiet, "Scanning USB bus.");
 #ifdef HAVE_PTHREAD
 		if (pthread_create(&thread[TYPE_USB], NULL, run_usb, &cli_link_detail_level)) {
@@ -1744,6 +1747,7 @@ int main(int argc, char *argv[])
 			nutscan_avail_snmp = 0;
 		}
 		else {
+			setproctag("snmp");
 			upsdebugx(quiet, "Scanning SNMP bus.");
 #ifdef HAVE_PTHREAD
 			upsdebugx(1, "SNMP SCAN: starting pthread_create with run_snmp...");
@@ -1767,6 +1771,7 @@ int main(int argc, char *argv[])
 		 * so it just runs (if requested and
 		 * supported).
 		 */
+		setproctag("netxml");
 		upsdebugx(quiet, "Scanning XML/HTTP bus.");
 		xml_sec.usec_timeout = timeout;
 #ifdef HAVE_PTHREAD
@@ -1790,6 +1795,7 @@ int main(int argc, char *argv[])
 			nutscan_avail_nut = 0;
 		}
 		else {
+			setproctag("oldnut");
 			upsdebugx(quiet, "Scanning NUT bus (old libupsclient connect method).");
 #ifdef HAVE_PTHREAD
 			upsdebugx(1, "NUT bus (old) SCAN: starting pthread_create with run_nut_old...");
@@ -1808,6 +1814,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (allow_nut_simulation && nutscan_avail_nut_simulation) {
+		setproctag("nut_simulation");
 		upsdebugx(quiet, "Scanning NUT simulation devices.");
 #ifdef HAVE_PTHREAD
 		upsdebugx(1, "NUT simulation devices SCAN: starting pthread_create with run_nut_simulation...");
@@ -1825,6 +1832,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (allow_avahi && nutscan_avail_avahi) {
+		setproctag("avahi");
 		upsdebugx(quiet, "Scanning NUT bus (avahi method).");
 #ifdef HAVE_PTHREAD
 		upsdebugx(1, "NUT bus (avahi) SCAN: starting pthread_create with run_avahi...");
@@ -1847,6 +1855,7 @@ int main(int argc, char *argv[])
 		 * so it just runs (if requested and
 		 * supported).
 		 */
+		setproctag("ipmi");
 		upsdebugx(quiet, "Scanning IPMI bus.");
 #ifdef HAVE_PTHREAD
 		upsdebugx(1, "IPMI SCAN: starting pthread_create with run_ipmi...");
@@ -1864,6 +1873,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (allow_upower && nutscan_avail_upower) {
+		setproctag("upower");
 		upsdebugx(quiet, "Scanning UPower bus.");
 #ifdef HAVE_PTHREAD
 		upsdebugx(1, "UPOWER SCAN: starting pthread_create with run_upower...");
@@ -1881,6 +1891,7 @@ int main(int argc, char *argv[])
 
 	/* Eaton serial scan */
 	if (allow_eaton_serial) {
+		setproctag("serial");
 		upsdebugx(quiet, "Scanning serial bus for Eaton devices.");
 #ifdef HAVE_PTHREAD
 		upsdebugx(1, "SERIAL SCAN: starting pthread_create with run_eaton_serial (return not checked!)...");
@@ -1897,6 +1908,8 @@ int main(int argc, char *argv[])
 		upsdebugx(1, "SERIAL SCAN: not requested or supported, SKIPPED");
 	}
 
+	setproctag("post-processing");
+
 #ifdef HAVE_PTHREAD
 	if (allow_usb && nutscan_avail_usb && thread[TYPE_USB]) {
 		upsdebugx(1, "USB SCAN: join back the pthread");