Add generated files

Author: IsakTjernberg

c/include/libsbp/cpp/message_traits.h

@@ -1039,19 +1039,19 @@ struct MessageTraits<msg_sbas_raw_t> {
 
 
 template<>
-struct MessageTraits<msg_linux_cpu_state_t> {
+struct MessageTraits<msg_linux_cpu_state_dep_a_t> {
   static constexpr u16 id = 32512;
 };
 
 
 template<>
-struct MessageTraits<msg_linux_mem_state_t> {
+struct MessageTraits<msg_linux_mem_state_dep_a_t> {
   static constexpr u16 id = 32513;
 };
 
 
 template<>
-struct MessageTraits<msg_linux_sys_state_t> {
+struct MessageTraits<msg_linux_sys_state_dep_a_t> {
   static constexpr u16 id = 32514;
 };
 
@@ -1086,6 +1086,24 @@ struct MessageTraits<msg_linux_process_fd_summary_t> {
 };
 
 
+template<>
+struct MessageTraits<msg_linux_cpu_state_t> {
+  static constexpr u16 id = 32520;
+};
+
+
+template<>
+struct MessageTraits<msg_linux_mem_state_t> {
+  static constexpr u16 id = 32521;
+};
+
+
+template<>
+struct MessageTraits<msg_linux_sys_state_t> {
+  static constexpr u16 id = 32522;
+};
+
+
 template<>
 struct MessageTraits<msg_startup_t> {
   static constexpr u16 id = 65280;

c/include/libsbp/linux.h

@@ -28,43 +28,43 @@
 SBP_PACK_START
 
 
-/** List CPU state on the system
+/** List CPU state on the system. DEPRECATED.
  *
  * This message indicates the process state of the top 10 heaviest
  * consumers of CPU on the system.
  */
-#define SBP_MSG_LINUX_CPU_STATE             0x7F00
+#define SBP_MSG_LINUX_CPU_STATE_DEP_A       0x7F00
 
 typedef struct SBP_ATTR_PACKED {
   u8 index;      /**< sequence of this status message, values from 0-9 */
   u16 pid;        /**< the PID of the process */
   u8 pcpu;       /**< percent of cpu used, expressed as a fraction of 256 */
   char tname[15];  /**< fixed length string representing the thread name */
   char cmdline[0]; /**< the command line (as much as it fits in the remaining packet) */
-} msg_linux_cpu_state_t;
+} msg_linux_cpu_state_dep_a_t;
 
 
-/** List CPU state on the system
+/** List memory state on the system. DEPRECATED.
  *
  * This message indicates the process state of the top 10 heaviest
  * consumers of memory on the system.
  */
-#define SBP_MSG_LINUX_MEM_STATE             0x7F01
+#define SBP_MSG_LINUX_MEM_STATE_DEP_A       0x7F01
 
 typedef struct SBP_ATTR_PACKED {
   u8 index;      /**< sequence of this status message, values from 0-9 */
   u16 pid;        /**< the PID of the process */
   u8 pmem;       /**< percent of memory used, expressed as a fraction of 256 */
   char tname[15];  /**< fixed length string representing the thread name */
   char cmdline[0]; /**< the command line (as much as it fits in the remaining packet) */
-} msg_linux_mem_state_t;
+} msg_linux_mem_state_dep_a_t;
 
 
-/** CPU, Memory and Process Starts/Stops
+/** CPU, Memory and Process Starts/Stops. DEPRECATED.
  *
  * This presents a summary of CPU and memory utilization.
  */
-#define SBP_MSG_LINUX_SYS_STATE             0x7F02
+#define SBP_MSG_LINUX_SYS_STATE_DEP_A       0x7F02
 
 typedef struct SBP_ATTR_PACKED {
   u16 mem_total;         /**< total system memory */
@@ -73,7 +73,7 @@ typedef struct SBP_ATTR_PACKED {
   u16 procs_starting;    /**< number of processes that started during collection phase */
   u16 procs_stopping;    /**< number of processes that stopped during collection phase */
   u16 pid_count;         /**< the count of processes on the system */
-} msg_linux_sys_state_t;
+} msg_linux_sys_state_dep_a_t;
 
 
 /** A list of processes with high socket counts
@@ -177,6 +177,99 @@ of the list being 2 NULL terminators in a row.
 } msg_linux_process_fd_summary_t;
 
 
+/** List CPU state on the system
+ *
+ * This message indicates the process state of the top 10 heaviest
+ * consumers of CPU on the system, including a timestamp.
+ */
+#define SBP_MSG_LINUX_CPU_STATE             0x7F08
+#define SBP_LINUX_CPU_STATE_TIMESTAMP_TYPE_MASK (0x7)
+#define SBP_LINUX_CPU_STATE_TIMESTAMP_TYPE_SHIFT (0u)
+#define SBP_LINUX_CPU_STATE_TIMESTAMP_TYPE_GET(flags) \
+                             (((flags) >> SBP_LINUX_CPU_STATE_TIMESTAMP_TYPE_SHIFT) \
+                             & SBP_LINUX_CPU_STATE_TIMESTAMP_TYPE_MASK)
+#define SBP_LINUX_CPU_STATE_TIMESTAMP_TYPE_SET(flags, val) \
+                             do {((flags) |= \
+                             (((val) & (SBP_LINUX_CPU_STATE_TIMESTAMP_TYPE_MASK)) \
+                             << (SBP_LINUX_CPU_STATE_TIMESTAMP_TYPE_SHIFT)));} while(0)
+                             
+
+#define SBP_LINUX_CPU_STATE_TIMESTAMP_TYPE_SYSTEM_TIME_IN_SECONDS (0)
+#define SBP_LINUX_CPU_STATE_TIMESTAMP_TYPE_GPS_TOW_IN_MILLISECONDS (1)
+
+typedef struct SBP_ATTR_PACKED {
+  u8 index;      /**< sequence of this status message, values from 0-9 */
+  u16 pid;        /**< the PID of the process */
+  u8 pcpu;       /**< percent of cpu used, expressed as a fraction of 256 */
+  u32 time;       /**< timestamp of message, refer to flags field for how to interpret */
+  u8 flags;      /**< flags */
+  char tname[15];  /**< fixed length string representing the thread name */
+  char cmdline[0]; /**< the command line (as much as it fits in the remaining packet) */
+} msg_linux_cpu_state_t;
+
+
+/** List memory state on the system
+ *
+ * This message indicates the process state of the top 10 heaviest
+ * consumers of memory on the system, including a timestamp.
+ */
+#define SBP_MSG_LINUX_MEM_STATE             0x7F09
+#define SBP_LINUX_MEM_STATE_TIMESTAMP_TYPE_MASK (0x7)
+#define SBP_LINUX_MEM_STATE_TIMESTAMP_TYPE_SHIFT (0u)
+#define SBP_LINUX_MEM_STATE_TIMESTAMP_TYPE_GET(flags) \
+                             (((flags) >> SBP_LINUX_MEM_STATE_TIMESTAMP_TYPE_SHIFT) \
+                             & SBP_LINUX_MEM_STATE_TIMESTAMP_TYPE_MASK)
+#define SBP_LINUX_MEM_STATE_TIMESTAMP_TYPE_SET(flags, val) \
+                             do {((flags) |= \
+                             (((val) & (SBP_LINUX_MEM_STATE_TIMESTAMP_TYPE_MASK)) \
+                             << (SBP_LINUX_MEM_STATE_TIMESTAMP_TYPE_SHIFT)));} while(0)
+                             
+
+#define SBP_LINUX_MEM_STATE_TIMESTAMP_TYPE_SYSTEM_TIME_IN_SECONDS (0)
+#define SBP_LINUX_MEM_STATE_TIMESTAMP_TYPE_GPS_TOW_IN_MILLISECONDS (1)
+
+typedef struct SBP_ATTR_PACKED {
+  u8 index;      /**< sequence of this status message, values from 0-9 */
+  u16 pid;        /**< the PID of the process */
+  u8 pmem;       /**< percent of memory used, expressed as a fraction of 256 */
+  u32 time;       /**< timestamp of message, refer to flags field for how to interpret */
+  u8 flags;      /**< flags */
+  char tname[15];  /**< fixed length string representing the thread name */
+  char cmdline[0]; /**< the command line (as much as it fits in the remaining packet) */
+} msg_linux_mem_state_t;
+
+
+/** CPU, Memory and Process Starts/Stops.
+ *
+ * This presents a summary of CPU and memory utilization, including a timestamp.
+ */
+#define SBP_MSG_LINUX_SYS_STATE             0x7F0A
+#define SBP_LINUX_SYS_STATE_TIMESTAMP_TYPE_MASK (0x7)
+#define SBP_LINUX_SYS_STATE_TIMESTAMP_TYPE_SHIFT (0u)
+#define SBP_LINUX_SYS_STATE_TIMESTAMP_TYPE_GET(flags) \
+                             (((flags) >> SBP_LINUX_SYS_STATE_TIMESTAMP_TYPE_SHIFT) \
+                             & SBP_LINUX_SYS_STATE_TIMESTAMP_TYPE_MASK)
+#define SBP_LINUX_SYS_STATE_TIMESTAMP_TYPE_SET(flags, val) \
+                             do {((flags) |= \
+                             (((val) & (SBP_LINUX_SYS_STATE_TIMESTAMP_TYPE_MASK)) \
+                             << (SBP_LINUX_SYS_STATE_TIMESTAMP_TYPE_SHIFT)));} while(0)
+                             
+
+#define SBP_LINUX_SYS_STATE_TIMESTAMP_TYPE_SYSTEM_TIME_IN_SECONDS (0)
+#define SBP_LINUX_SYS_STATE_TIMESTAMP_TYPE_GPS_TOW_IN_MILLISECONDS (1)
+
+typedef struct SBP_ATTR_PACKED {
+  u16 mem_total;         /**< total system memory */
+  u8 pcpu;              /**< percent of total cpu currently utilized */
+  u8 pmem;              /**< percent of total memory currently utilized */
+  u16 procs_starting;    /**< number of processes that started during collection phase */
+  u16 procs_stopping;    /**< number of processes that stopped during collection phase */
+  u16 pid_count;         /**< the count of processes on the system */
+  u32 time;              /**< timestamp of message, refer to flags field for how to interpret */
+  u8 flags;             /**< flags */
+} msg_linux_sys_state_t;
+
+
 /** \} */
 
 SBP_PACK_END