Changeset a3730b38 in rtems

Timestamp:

Jan 11, 2017, 10:04:35 AM (3 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

96bb2e4b

Parents:

b7f1fc3

git-author:

Sebastian Huber <sebastian.huber@…> (01/11/17 10:04:35)

git-committer:

Sebastian Huber <sebastian.huber@…> (01/12/17 06:44:37)

Message:

Add and use rtems_assoc_thread_states_to_string()

Location:

cpukit

Files:

• libcsupport/Makefile.am (modified) (1 diff)
• libcsupport/include/rtems/assoc.h (modified) (1 diff)
• libcsupport/src/assocthreadstatestostring.c (added)
• libdebugger/rtems-debugger-threads.c (modified) (2 diffs)
• libmisc/monitor/mon-prmisc.c (modified) (2 diffs)

cpukit/libcsupport/Makefile.am

@@ -40 +40 @@
     src/assocremotebylocal.c src/assocremotebyname.c
 ASSOCIATION_C_FILES += src/assoc32tostring.c
+ASSOCIATION_C_FILES += src/assocthreadstatestostring.c
 
 BASE_FS_C_FILES = src/base_fs.c src/mount.c src/unmount.c src/libio.c \

cpukit/libcsupport/include/rtems/assoc.h

@@ -182 +182 @@
 );
 
+/**
+ * @brief Converts the specified thread states into a text representation.
+ *
+ * @param[in] states The thread states to convert.
+ * @param[in] buffer The buffer for the text representation.
+ * @param[in] buffer_size The buffer size in characters.
+ *
+ * @retval The length of the text representation.  May be greater than the
+ * buffer size if truncation occurred.
+ */
+size_t rtems_assoc_thread_states_to_string(
+  uint32_t  states,
+  char     *buffer,
+  size_t    buffer_size
+);
+
 #ifdef __cplusplus
 }

cpukit/libdebugger/rtems-debugger-threads.c

@@ -29 +29 @@
 
 #include <rtems.h>
-#include <rtems/score/statesimpl.h>
+#include <rtems/assoc.h>
 #include <rtems/score/threadimpl.h>
 
@@ -507 +507 @@
 int
 rtems_debugger_thread_state_str(rtems_debugger_thread* thread,
-                                char*                  buffer,
+                                char*                  buf,
                                 size_t                 size)
 {
-  struct mapper {
-    const char const* label;
-    DB_UINT           mask;
-  };
-  const struct mapper map[] = {
-    { "DORM",   STATES_DORMANT },
-    { "LIFE",   STATES_LIFE_IS_CHANGING },
-    { "SUSP",   STATES_SUSPENDED },
-    { "Wbar",   STATES_WAITING_FOR_BARRIER },
-    { "Wcvar",  STATES_WAITING_FOR_CONDITION_VARIABLE },
-    { "Wevnt",  STATES_WAITING_FOR_EVENT },
-    { "ISIG" ,  STATES_INTERRUPTIBLE_BY_SIGNAL },
-    { "Wjatx",  STATES_WAITING_FOR_JOIN_AT_EXIT },
-    { "Wjoin",  STATES_WAITING_FOR_JOIN },
-    { "Wmsg" ,  STATES_WAITING_FOR_MESSAGE },
-    { "Wmutex", STATES_WAITING_FOR_MUTEX },
-    { "WRATE",  STATES_WAITING_FOR_PERIOD },
-    { "Wrpc",   STATES_WAITING_FOR_RPC_REPLY },
-    { "Wrwlk",  STATES_WAITING_FOR_RWLOCK },
-    { "Wseg",   STATES_WAITING_FOR_SEGMENT },
-    { "Wsem",   STATES_WAITING_FOR_SEMAPHORE },
-    { "Wsig",   STATES_WAITING_FOR_SIGNAL },
-    { "Wfutex", STATES_WAITING_FOR_FUTEX },
-    { "TQID",   STATES_THREAD_QUEUE_WITH_IDENTIFIER },
-    { "Wsysev", STATES_WAITING_FOR_SYSTEM_EVENT },
-    { "Wtime",  STATES_WAITING_FOR_TIME },
-    { "Wwkup",  STATES_WAITING_FOR_BSD_WAKEUP },
-    { "ZOMBI",  STATES_ZOMBIE },
-  };
-  DB_UINT state = thread->tcb->current_state;
-  if (state == STATES_READY) {
-    strcpy(buffer, "READY");
-  }
-  else {
-    char*  start = buffer;
-    size_t i;
-    buffer[0] = '\0';
-    buffer[size - 1] = '\0';
-    for (i = 0; size > 0 && i < RTEMS_DEBUGGER_NUMOF(map); ++i) {
-      if ((map[i].mask & state) != 0) {
-        size_t l = snprintf(buffer, size - 1, "%s ", map[i].label);
-        buffer += l;
-        size -= l;
-      }
-    }
-    if (buffer != start)
-      *(buffer - 1) = '\0';
-  }
+  rtems_assoc_thread_states_to_string(thread->tcb->current_state, buf, size);
   return 0;
 }

cpukit/libmisc/monitor/mon-prmisc.c

@@ -13 +13 @@
 #include <rtems/monitor.h>
 #include <rtems/assoc.h>
-#include <rtems/score/statesimpl.h>
 
 #include <stdio.h>
@@ -113 +112 @@
 }
 
-#define WITH_ID(state) (STATES_THREAD_QUEUE_WITH_IDENTIFIER | state)
-
-static const rtems_assoc_t rtems_monitor_state_assoc[] = {
-    { "DORM",   STATES_DORMANT, 0 },
-    { "LIFE",   STATES_LIFE_IS_CHANGING, 0 },
-    { "SUSP",   STATES_SUSPENDED, 0 },
-    { "Wbar",   WITH_ID(STATES_WAITING_FOR_BARRIER), 0 },
-    { "Wcvar",  WITH_ID(STATES_WAITING_FOR_CONDITION_VARIABLE), 0 },
-    { "Wevnt",  STATES_WAITING_FOR_EVENT, 0 },
-    { "Wisig",  STATES_INTERRUPTIBLE_BY_SIGNAL, 0 },
-    { "Wjatx",  STATES_WAITING_FOR_JOIN_AT_EXIT, 0 },
-    { "Wjoin",  STATES_WAITING_FOR_JOIN, 0 },
-    { "Wmsg" ,  WITH_ID(STATES_WAITING_FOR_MESSAGE), 0 },
-    { "Wmutex", WITH_ID(STATES_WAITING_FOR_MUTEX), 0 },
-    { "WRATE",  STATES_WAITING_FOR_PERIOD, 0 },
-    { "Wrpc",   STATES_WAITING_FOR_RPC_REPLY, 0 },
-    { "Wrwlk",  WITH_ID(STATES_WAITING_FOR_RWLOCK), 0 },
-    { "Wseg",   STATES_WAITING_FOR_SEGMENT, 0 },
-    { "Wsem",   WITH_ID(STATES_WAITING_FOR_SEMAPHORE), 0 },
-    { "Wsig",   STATES_WAITING_FOR_SIGNAL, 0 },
-    { "Wcvar",  STATES_WAITING_FOR_CONDITION_VARIABLE, 0 },
-    { "Wfutex", STATES_WAITING_FOR_FUTEX, 0 },
-    { "Wmutex", STATES_WAITING_FOR_MUTEX, 0 },
-    { "Wsem",   STATES_WAITING_FOR_SEMAPHORE, 0 },
-    { "Wsysev", STATES_WAITING_FOR_SYSTEM_EVENT, 0 },
-    { "Wtime",  STATES_WAITING_FOR_TIME, 0 },
-    { "Wwkup",  STATES_WAITING_FOR_BSD_WAKEUP, 0 },
-    { "ZOMBI",  STATES_ZOMBIE, 0 },
-    { 0, 0, 0 },
-};
-
 int
 rtems_monitor_dump_state(States_Control state)
 {
-    int   length = 0;
+    char buf[16];
 
-    if (state == STATES_READY)  /* assoc doesn't deal with this as it is 0 */
-        length += fprintf(stdout,"READY");
-
-    length += rtems_monitor_dump_assoc_bitfield(rtems_monitor_state_assoc,
-                                                ":",
-                                                state);
-    return length;
+    rtems_assoc_thread_states_to_string(state, buf, sizeof(buf));
+    return fprintf(stdout, "%s", buf);
 }