добавил получение sysinfo и вывод аптайма в веб-морде

src/main.cpp

@@ -206,6 +206,8 @@ public:
             rep.headers.push_back({.name = "Content-Type", .value = toString(mime_types::json)});
             std::string result = R"({"mainState":)";
             result += api->loadTerminalState();
+            result += R"(,"sysinfo":)";
+            result += api->loadSysInfo();
             result += "}";
             rep.content.insert(rep.content.end(), result.c_str(), result.c_str() + result.size());
         }));

src/terminal_api_driver.cpp

@@ -8,6 +8,8 @@
 #include <boost/thread.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/property_tree/json_parser.hpp>
+#include <sys/sysinfo.h>
+
 
 
 typedef boost::property_tree::ptree::path_type json_path;
@@ -1091,4 +1093,42 @@ void api_driver::ApiDriver::executeInApi(const std::function<void(TSID sid)>& ca
     }
 }
 
+std::string api_driver::ApiDriver::loadSysInfo() {
+    std::stringstream result;
+    struct sysinfo info{};
+    sysinfo(&info);
+
+    struct sysinfo {
+        long uptime;             /* Seconds since boot */
+        unsigned long loads[3];  /* 1, 5, and 15 minute load averages */
+        unsigned long totalram;  /* Total usable main memory size */
+        unsigned long freeram;   /* Available memory size */
+        unsigned long sharedram; /* Amount of shared memory */
+        unsigned long bufferram; /* Memory used by buffers */
+        unsigned long totalswap; /* Total swap space size */
+        unsigned long freeswap;  /* Swap space still available */
+        unsigned short procs;    /* Number of current processes */
+        unsigned long totalhigh; /* Total high memory size */
+        unsigned long freehigh;  /* Available high memory size */
+        unsigned int mem_unit;   /* Memory unit size in bytes */
+    };
+
+    result << "{\n\"uptime\":" << info.uptime;
+    result << ",\"load1min\":" << info.loads[0];
+    result << ",\"load5min\":" << info.loads[1];
+    result << ",\"load15min\":" << info.loads[2];
+    result << ",\"totalram\":" << info.totalram;
+    result << ",\"freeram\":" << info.freeram;
+    result << ",\"sharedram\":" << info.sharedram;
+    result << ",\"bufferram\":" << info.bufferram;
+    result << ",\"totalswap\":" << info.totalswap;
+    result << ",\"freeswap\":" << info.freeswap;
+    result << ",\"procs\":" << static_cast<long>(info.procs);
+    result << ",\"totalhigh\":" << info.totalhigh;
+    result << ",\"freehigh\":" << info.freehigh;
+    result << ",\"mem_unit\":" << info.mem_unit;
+    result << "\n}";
+    return result.str();
+}
+
 api_driver::ApiDriver::~ApiDriver() = default;

src/terminal_api_driver.h

@@ -70,6 +70,8 @@ namespace api_driver {
 
         void executeInApi(const std::function<void(TSID sid)>& callback);
 
+        static std::string loadSysInfo();
+
         ~ApiDriver();
 
     private:

static/main-scpc.html

@@ -118,6 +118,7 @@
                     <tr><th>Температура ADRV</th><td>{{ stat_device.adrv }} °C</td></tr>
                     <tr><th>Температура ZYNQ</th><td>{{ stat_device.zynq }} °C</td></tr>
                     <tr><th>Температура FPGA</th><td>{{ stat_device.fpga }} °C</td></tr>
+                    <tr><th>Uptime</th><td>{{ stat_os.uptime }}</td></tr>
                     </tbody>
                 </table>
             </div>
@@ -849,6 +850,7 @@
             stat_device: { // температурные датчики
                 adrv: 0, zynq: 0, fpga: 0
             },
+            stat_os: {uptime: '?'},
 
             param: {
                 general: {
@@ -1037,6 +1039,21 @@
                 this.stat_device.fpga = vals["mainState"]["device.fpga"]
 
                 this.testState = vals["mainState"]["testState"]
+
+                // аптайм приходит в секундах, надо преобразовать его в человеко-читаемый вид
+                let uptime = vals["sysinfo"]["uptime"]
+                if (uptime) {
+                    let secs = uptime % 60; uptime = Math.floor(uptime / 60)
+                    let mins = uptime % 60; uptime = Math.floor(uptime / 60)
+                    let hours = uptime % 24
+                    uptime = Math.floor( uptime / 24)
+                    let res = `${mins}m ${secs}s`
+                    if (hours > 0) { res = `${hours}h ` + res }
+                    if (uptime > 0) { res = `${uptime}d ` + res }
+                    this.stat_os.uptime = res
+                } else {
+                    this.stat_os.uptime = '?'
+                }
             },
 
             resetPacketsStatistics() {

static/main-tdma.html

@@ -105,6 +105,7 @@
                     <tr><th>Температура ADRV</th><td>{{ stat_device.adrv }} °C</td></tr>
                     <tr><th>Температура ZYNQ</th><td>{{ stat_device.zynq }} °C</td></tr>
                     <tr><th>Температура FPGA</th><td>{{ stat_device.fpga }} °C</td></tr>
+                    <tr><th>Uptime</th><td>{{ stat_os.uptime }}</td></tr>
                     </tbody>
                 </table>
             </div>
@@ -641,6 +642,7 @@
             stat_device: { // температурные датчики
                 adrv: 0, zynq: 0, fpga: 0
             },
+            stat_os: {uptime: '?'},
 
             param: {
                 tx: {
@@ -775,6 +777,21 @@
                 this.stat_device.fpga = vals["mainState"]["device.fpga"]
 
                 this.testState = vals["mainState"]["testState"]
+
+                // аптайм приходит в секундах, надо преобразовать его в человеко-читаемый вид
+                let uptime = vals["sysinfo"]["uptime"]
+                if (uptime) {
+                    let secs = uptime % 60; uptime = Math.floor(uptime / 60)
+                    let mins = uptime % 60; uptime = Math.floor(uptime / 60)
+                    let hours = uptime % 24
+                    uptime = Math.floor( uptime / 24)
+                    let res = `${mins}m ${secs}s`
+                    if (hours > 0) { res = `${hours}h ` + res }
+                    if (uptime > 0) { res = `${uptime}d ` + res }
+                    this.stat_os.uptime = res
+                } else {
+                    this.stat_os.uptime = '?'
+                }
             },
 
             resetPacketsStatistics() {