From 172f0a50bae98c0076a8cccac9ccc14b68754375 Mon Sep 17 00:00:00 2001 From: Benoit Dejean Date: Sun, 21 Jun 2015 22:39:11 +0200 Subject: [PATCH] Convert lots of fprintf(stderr, ...) to glibtop_debug*(). --- lib/command.c | 6 ++---- lib/open.c | 32 ++++++++------------------------ lib/read.c | 4 +--- lib/read_data.c | 8 ++------ lib/write.c | 4 +--- src/daemon/io.c | 12 +++--------- src/daemon/main.c | 3 --- src/daemon/slave.c | 10 +++------- src/daemon/version.c | 4 +--- sysdeps/freebsd/suid_open.c | 4 +--- 10 files changed, 22 insertions(+), 65 deletions(-) diff --git a/lib/command.c b/lib/command.c index 5be309ee..f6cf86f5 100644 --- a/lib/command.c +++ b/lib/command.c @@ -45,7 +45,7 @@ glibtop_call_l (glibtop *server, unsigned command, size_t send_size, #ifdef LIBGTOP_ENABLE_DEBUG g_assert(command >= GLIBTOP_CMND_QUIT && command < GLIBTOP_MAX_CMND); switch (command) { -#define DEBUG_CALL(CMD) case (CMD): glibtop_warn_r(server, "CALL: command %s sending %lu bytes", #CMD, (unsigned long)send_size); break +#define DEBUG_CALL(CMD) case (CMD): glibtop_debug("CALL: command %s sending %lu bytes", #CMD, (unsigned long)send_size); break DEBUG_CALL(GLIBTOP_CMND_QUIT); DEBUG_CALL(GLIBTOP_CMND_SYSDEPS); DEBUG_CALL(GLIBTOP_CMND_CPU); @@ -91,10 +91,8 @@ glibtop_call_l (glibtop *server, unsigned command, size_t send_size, glibtop_read_l (server, sizeof (glibtop_response), &response); -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "RESPONSE: offset=%lu - data_size=%lu\n", + glibtop_debug ("RESPONSE: offset=%lu - data_size=%lu", response.offset, response.data_size); -#endif if (recv_buf) memcpy (recv_buf, ((char *) &response) + response.offset, diff --git a/lib/open.c b/lib/open.c index a63025fa..c56cbdfe 100644 --- a/lib/open.c +++ b/lib/open.c @@ -47,56 +47,44 @@ glibtop_open_l (glibtop *server, const char *program_name, server->error_method = GLIBTOP_ERROR_METHOD_DEFAULT; -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "SIZEOF: %u - %u - %u - %u - %u - %u\n", + glibtop_debug ("SIZEOF: %u - %u - %u - %u - %u - %u", sizeof (glibtop_command), sizeof (glibtop_response), sizeof (glibtop_mountentry), sizeof (glibtop_union), sizeof (glibtop_sysdeps), sizeof (glibtop_response_union)); -#endif switch (server->method) { case GLIBTOP_METHOD_DIRECT: server->features = 0; break; case GLIBTOP_METHOD_INET: -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "Connecting to '%s' port %ld.\n", + glibtop_debug ("Connecting to '%s' port %ld.", server->server_host, server->server_port); -#endif connect_type = glibtop_make_connection (server->server_host, server->server_port, &server->socket); -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "Connect Type is %d.\n", connect_type); -#endif + glibtop_debug ("Connect Type is %d.", connect_type); server->flags |= _GLIBTOP_INIT_STATE_SERVER; server->features = -1; break; case GLIBTOP_METHOD_UNIX: -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "Connecting to Unix Domain Socket.\n"); -#endif + glibtop_debug ("Connecting to Unix Domain Socket."); connect_type = glibtop_make_connection ("unix", 0, &server->socket); -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "Connect Type is %d.\n", connect_type); -#endif + glibtop_debug ("Connect Type is %d.", connect_type); server->flags |= _GLIBTOP_INIT_STATE_SERVER; server->features = -1; break; case GLIBTOP_METHOD_PIPE: -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "Opening pipe to server (%s).\n", + glibtop_debug ("Opening pipe to server (%s).", server->server_command); -#endif if (pipe (server->input) || pipe (server->output)) glibtop_error_io_r (server, "cannot make a pipe"); @@ -165,18 +153,14 @@ glibtop_open_l (glibtop *server, const char *program_name, memcpy (&server->sysdeps, &sysdeps, sizeof (glibtop_sysdeps)); -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "Server features are %lu.\n", + glibtop_debug ("Server features are %lu.", server->features); -#endif } /* In any case, we call the open functions of our own sysdeps * directory. */ -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "Calling sysdeps open function.\n"); -#endif + glibtop_debug ("Calling sysdeps open function."); glibtop_init_s (&server, features, flags); } diff --git a/lib/read.c b/lib/read.c index 477eea3f..6e88062b 100644 --- a/lib/read.c +++ b/lib/read.c @@ -33,9 +33,7 @@ glibtop_read_l (glibtop *server, size_t size, void *buf) int fd; glibtop_init_r (&server, 0, 0); -#ifdef LIBGTOP_ENABLE_DEBUG - glibtop_warn_r(server, "LIBRARY: really reading %d bytes.\n", (int)size); -#endif + glibtop_debug("LIBRARY: really reading %d bytes.", (int)size); fd = server->socket ? server->socket : server->input[0]; diff --git a/lib/read_data.c b/lib/read_data.c index 95880647..9ef08d8a 100644 --- a/lib/read_data.c +++ b/lib/read_data.c @@ -36,10 +36,8 @@ glibtop_read_data_l (glibtop *server) glibtop_init_r (&server, 0, 0); -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "LIBRARY: reading %lu data bytes.\n", + glibtop_debug ("LIBRARY: reading %lu data bytes.", (unsigned long) sizeof (size_t)); -#endif if (server->socket) { ret = recv (server->socket, &size, sizeof (size_t), 0); @@ -50,10 +48,8 @@ glibtop_read_data_l (glibtop *server) if (ret < 0) glibtop_error_io_r (server, _("read data size")); -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "LIBRARY: really reading %lu data bytes (ret = %d).\n", + glibtop_debug ("LIBRARY: really reading %lu data bytes (ret = %d).", (unsigned long) size, ret); -#endif if (!size) return NULL; diff --git a/lib/write.c b/lib/write.c index eb1b9b74..6720c7e3 100644 --- a/lib/write.c +++ b/lib/write.c @@ -37,9 +37,7 @@ glibtop_write_l (glibtop *server, size_t size, void *buf) if (size == 0) return; -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "LIBRARY: really writing %d bytes.\n", (int)size); -#endif + glibtop_debug("LIBRARY: really writing %d bytes.", (int)size); fd = server->socket ? server->socket : server->output[1]; diff --git a/src/daemon/io.c b/src/daemon/io.c index bcc3afeb..36c526f5 100644 --- a/src/daemon/io.c +++ b/src/daemon/io.c @@ -27,10 +27,8 @@ void do_output (int s, glibtop_response *resp, off_t offset, size_t data_size, const void *data) { -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "Really writing %d bytes at offset %lu.\n", + glibtop_debug ("Really writing %d bytes at offset %lu.", sizeof (glibtop_response), offset); -#endif resp->offset = offset; resp->data_size = data_size; @@ -44,9 +42,7 @@ do_output (int s, glibtop_response *resp, off_t offset, } if (resp->data_size) { -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size); -#endif + glibtop_debug ("Writing %d bytes of data.", resp->data_size); if (s == 0) { if (write (1, data, resp->data_size) < 0) @@ -88,10 +84,8 @@ do_read (int s, void *ptr, size_t total_size) tmp_ptr += nread; ptr = tmp_ptr; -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "READ (%d): %d - %d - %d\n", + glibtop_debug ("READ (%d): %d - %d - %d", nread, already_read, remaining, total_size); -#endif } return already_read; diff --git a/src/daemon/main.c b/src/daemon/main.c index 38f0c889..11364229 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -26,9 +26,6 @@ #ifndef PARENT_DEBUG #define PARENT_DEBUG 1 #endif -#ifndef LIBGTOP_ENABLE_DEBUG -#define LIBGTOP_ENABLE_DEBUG 1 -#endif #endif void diff --git a/src/daemon/slave.c b/src/daemon/slave.c index 1e9004b1..2858ee8a 100644 --- a/src/daemon/slave.c +++ b/src/daemon/slave.c @@ -41,10 +41,8 @@ handle_slave_connection (int input, int output) glibtop_send_version (glibtop_global_server, output); while (do_read (input, cmnd, sizeof (glibtop_command))) { -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "Slave %d received command " - "%llu from client.\n", getpid (), cmnd->command); -#endif + glibtop_debug ("Slave %d received command " + "%llu from client.", getpid (), cmnd->command); if (cmnd->data_size >= BUFSIZ) glibtop_error ("Client sent %llu bytes, " @@ -56,10 +54,8 @@ handle_slave_connection (int input, int output) memset (parameter, 0, sizeof (parameter)); if (cmnd->data_size) { -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "Client has %llu bytes of data.\n", + glibtop_debug ("Client has %llu bytes of data.", cmnd->data_size); -#endif do_read (input, parameter, cmnd->data_size); diff --git a/src/daemon/version.c b/src/daemon/version.c index 28cbf79a..8eae8cfe 100644 --- a/src/daemon/version.c +++ b/src/daemon/version.c @@ -42,9 +42,7 @@ glibtop_send_version (glibtop *server, int fd) size = strlen (buffer) + 1; -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "SERVER ID: |%s|\n", buffer); -#endif + glibtop_debug ("SERVER ID: |%s|", buffer); if (fd == 0) { if (write (1, (const void *) &size, sizeof (size)) < 0) diff --git a/sysdeps/freebsd/suid_open.c b/sysdeps/freebsd/suid_open.c index 96bf7f49..c27e4923 100644 --- a/sysdeps/freebsd/suid_open.c +++ b/sysdeps/freebsd/suid_open.c @@ -56,9 +56,7 @@ glibtop_open_p (glibtop *server, const char *program_name, const unsigned flags) { char errbuf[_POSIX2_LINE_MAX]; -#ifdef LIBGTOP_ENABLE_DEBUG - fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ()); -#endif + glibtop_debug ("glibtop_open_p ()"); /* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */ server->machine.uid = getuid ();