RFC: patch to trigger thread stats output from cyclictest with SIGHUP

John,

Steven suggested a feature for cyclictest that I'd actually been whining about (internally anyway). During long rteval runs there's really no feedback available if you want to know how the run is progressing. Steven suggested sending SIGHUP and dumping the current state. Below is a patch that seems to work for cyclictest; just wanted to get some feedback on whether this would be acceptable behaviour.

Of course if we get this going then we need to figure out how to wire it into rteval as well :).

Clark

src/cyclictest/cyclictest.c +19 -2

index 0a15dcb..51b97cf 100644
@@ -199,6 +199,11 @@ static char **traceptr;
 static int traceopt_count;
 static int traceopt_size;
 
+static struct thread_param **parameters;
+static struct thread_stat **statistics;
+
+static void print_stat(struct thread_param *par, int index, int verbose);
+
 static int latency_target_fd = -1;
 static int32_t latency_target_value = 0;
 

@@ -1368,6 +1373,19 @@ static int check_timer(void)
 
 static void sighand(int sig)
 {
+       if (sig == SIGHUP) {
+               int i;
+               int oldquiet = quiet;
+
+               quiet = 0;
+               printf("#---------------------------\n");
+               printf("# cyclictest current status:\n");
+               for (i = 0; i < num_threads; i++)
+                       print_stat(parameters[i], i, 0);
+               printf("#---------------------------\n");
+               quiet = oldquiet;
+               return;
+       }
        shutdown = 1;
        if (refresh_on_max)
                pthread_cond_signal(&refresh_on_max_cond);

@@ -1503,8 +1521,6 @@ int main(int argc, char **argv)
        sigset_t sigset;
        int signum = SIGALRM;
        int mode;
-       struct thread_param **parameters;
-       struct thread_stat **statistics;
        int max_cpus = sysconf(_SC_NPROCESSORS_CONF);
        int i, ret = -1;
        int status;

@@ -1642,6 +1658,7 @@ int main(int argc, char **argv)
 
        signal(SIGINT, sighand);
        signal(SIGTERM, sighand);
+       signal(SIGHUP, sighand);
 
        parameters = calloc(num_threads, sizeof(struct thread_param *));
        if (!parameters)

Quoted 9 lines · Clark Williams

John,

Steven suggested a feature for cyclictest that I'd actually been
whining about (internally anyway). During long rteval runs
there's really no feedback available if you want to know how the run is progressing. Steven suggested sending SIGHUP and dumping the current state. Below is a patch that seems to work for cyclictest; just wanted to get some feedback on whether this would be acceptable behaviour.

Is USR1 already in use for something? That would be consistent with how things like dd use USR1 signal - to report interim stats.

P.

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 12 lines · Paul Gortmaker

Quoted 9 lines · Clark Williams

John,

Steven suggested a feature for cyclictest that I'd actually been
whining about (internally anyway). During long rteval runs
there's really no feedback available if you want to know how the run is progressing. Steven suggested sending SIGHUP and dumping the current state. Below is a patch that seems to work for cyclictest; just wanted to get some feedback on whether this would be acceptable behaviour.

Quoted 4 lines

Is USR1 already in use for something? That would be consistent with how things like dd use USR1 signal - to report interim stats.

P.

+1 ... I was just about to say exactly the same.

John,

Steven suggested a feature for cyclictest that I'd actually been whining about (internally anyway). During long rteval runs there's really no feedback available if you want to know how the run is progressing. Steven suggested sending SIGHUP and dumping the current state. Below is a patch that seems to work for cyclictest; just wanted to get some feedback on whether this would be acceptable behaviour.

Of course if we get this going then we need to figure out how to wire it into rteval as well :).

Clark

src/cyclictest/cyclictest.c +18 -2

index 0a15dcb..51b97cf 100644
@@ -199,6 +199,11 @@ static char **traceptr;
 static int traceopt_count;
 static int traceopt_size;
 
+static struct thread_param **parameters;
+static struct thread_stat **statistics;
+
+static void print_stat(struct thread_param *par, int index, int verbose);
+
 static int latency_target_fd = -1;
 static int32_t latency_target_value = 0;
 

@@ -1368,6 +1373,19 @@ static int check_timer(void)
 
 static void sighand(int sig)
 {
+	if (sig == SIGHUP) {
+		int i;
+		int oldquiet = quiet;
+
+		quiet = 0;
+		printf("#---------------------------\n");
+		printf("# cyclictest current status:\n");
+		for (i = 0; i < num_threads; i++)
+			print_stat(parameters[i], i, 0);
+		printf("#---------------------------\n");
+		quiet = oldquiet;
+		return;
+	}
 	shutdown = 1;
 	if (refresh_on_max)
 		pthread_cond_signal(&refresh_on_max_cond);

@@ -1503,8 +1521,6 @@ int main(int argc, char **argv)
 	sigset_t sigset;
 	int signum = SIGALRM;
 	int mode;
-	struct thread_param **parameters;
-	struct thread_stat **statistics;
 	int max_cpus = sysconf(_SC_NPROCESSORS_CONF);
 	int i, ret = -1;
 	int status;

Quoted 63 lines · Clark Williams

John,

Steven suggested a feature for cyclictest that I'd actually been whining about (internally anyway). During long rteval runs there's really no feedback available if you want to know how the run is progressing. Steven suggested sending SIGHUP and dumping the current state. Below is a patch that seems to work for cyclictest; just wanted to get some feedback on whether this would be acceptable behaviour.

Of course if we get this going then we need to figure out how to wire it into rteval as well :).

Clark

src/cyclictest/cyclictest.c +18 -2

index 0a15dcb..51b97cf 100644
@@ -199,6 +199,11 @@ static char **traceptr;
 static int traceopt_count;
 static int traceopt_size;
 
+static struct thread_param **parameters;
+static struct thread_stat **statistics;
+
+static void print_stat(struct thread_param *par, int index, int verbose);
+
 static int latency_target_fd = -1;
 static int32_t latency_target_value = 0;
 

@@ -1368,6 +1373,19 @@ static int check_timer(void)
 
 static void sighand(int sig)
 {
+	if (sig == SIGHUP) {
+		int i;
+		int oldquiet = quiet;
+
+		quiet = 0;
+		printf("#---------------------------\n");
+		printf("# cyclictest current status:\n");
+		for (i = 0; i < num_threads; i++)
+			print_stat(parameters[i], i, 0);
+		printf("#---------------------------\n");
+		quiet = oldquiet;
+		return;
+	}
 	shutdown = 1;
 	if (refresh_on_max)
 		pthread_cond_signal(&refresh_on_max_cond);

@@ -1503,8 +1521,6 @@ int main(int argc, char **argv)
 	sigset_t sigset;
 	int signum = SIGALRM;
 	int mode;
-	struct thread_param **parameters;
-	struct thread_stat **statistics;
 	int max_cpus = sysconf(_SC_NPROCESSORS_CONF);
 	int i, ret = -1;
 	int status;

src/cyclictest/cyclictest.c int main(int argc, char **argv) · line 1664

Quoted 7 lines

src/cyclictest/cyclictest.c +1 -0

@@ -1642,6 +1658,7 @@ int main(int argc, char **argv)
 
 	signal(SIGINT, sighand);
 	signal(SIGTERM, sighand);
+	signal(SIGHUP, sighand);
 
 	parameters = calloc(num_threads, sizeof(struct thread_param *));
 	if (!parameters)

Where's your SOB Clark? I'm assuming that you and not Steve are the author. I can add this to my development dir for people to try.

Thanks

John