Type the "process_status" interface properly
- and in implementation for linux-gnu, reflect that some kernels don't
distinguish job-control stop and tracing stop by different letter.
diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c
index b55c5ef..e854e66 100644
--- a/sysdeps/linux-gnu/proc.c
+++ b/sysdeps/linux-gnu/proc.c
@@ -135,19 +135,49 @@
static enum pcb_status
process_status_cb(const char * line, const char * prefix, void * data)
{
- *(char *)data = line[strlen(prefix)];
- return pcb_stop;
+ const char * status = line + strlen(prefix);
+ const char c = *status;
+
+#define RETURN(C) do { \
+ *(enum process_status *)data = C; \
+ return pcb_stop; \
+ } while (0)
+
+ switch (c) {
+ case 'Z': RETURN(ps_zombie);
+ case 't': RETURN(ps_tracing_stop);
+ case 'T': {
+ /* This can be either "T (stopped)" or, for older
+ * kernels, "T (tracing stop)". */
+ if (!strcmp(status, "T (stopped)\n"))
+ RETURN(ps_stop);
+ else if (!strcmp(status, "T (tracing stop)\n"))
+ RETURN(ps_tracing_stop);
+ else {
+ fprintf(stderr, "Unknown process status: %s",
+ status);
+ RETURN(ps_stop); /* Some sort of stop
+ * anyway. */
+ }
+ }
+ }
+
+ RETURN(ps_other);
+#undef RETURN
}
-char
+enum process_status
process_status(pid_t pid)
{
- char ret = '?';
+ enum process_status ret = ps_invalid;
FILE * file = open_status_file(pid);
if (file != NULL) {
each_line_starting(file, "State:\t", &process_status_cb, &ret);
fclose(file);
}
+ if (ret == ps_invalid)
+ fprintf(stderr, "Couldn't determine status of process %d\n",
+ pid);
return ret;
}
diff --git a/sysdeps/linux-gnu/trace.c b/sysdeps/linux-gnu/trace.c
index e678536..8efd284 100644
--- a/sysdeps/linux-gnu/trace.c
+++ b/sysdeps/linux-gnu/trace.c
@@ -214,19 +214,18 @@
static enum pcb_status
task_stopped(Process * task, void * data)
{
- int status;
-
/* If the task is already stopped, don't worry about it.
* Likewise if it managed to become a zombie or terminate in
* the meantime. This can happen when the whole thread group
* is terminating. */
- switch (status = process_status(task->pid))
- case -1:
- case 't':
- case 'Z':
+ switch (process_status(task->pid)) {
+ case ps_invalid:
+ case ps_tracing_stop:
+ case ps_zombie:
return pcb_cont;
-
- return pcb_stop;
+ default:
+ return pcb_stop;
+ }
}
static struct pid_task *