pcm-iio: add date/time to csv output

Author: rdementi

src/pcm-iio.cpp

@@ -676,6 +676,14 @@ vector<string> build_csv(vector<struct iio_stacks_on_socket>& iios, vector<struc
     if (show_root_port)
         header.insert(header.begin(), "Root Port");
     header.insert(header.begin(), "Socket");
+    auto insertDateTime = [&csv_delimiter](vector<string> & out, CsvOutputType type) {
+        std::string dateTime;
+        printDateForCSV(type, csv_delimiter, &dateTime);
+        // remove last delimiter
+        dateTime.pop_back();
+        out.insert(out.begin(), dateTime);
+    };
+    insertDateTime(header, CsvOutputType::Header2);
     result.push_back(build_csv_row(header, csv_delimiter));
     std::map<uint32_t,map<uint32_t,struct iio_counter*>> v_sort;
     //re-organize data collection to be row wise
@@ -721,6 +729,7 @@ vector<string> build_csv(vector<struct iio_stacks_on_socket>& iios, vector<struc
                     uint64_t raw_data = hunit->second->data[0][socket->socket_id][stack_id][std::pair<h_id,v_id>(hh_id,vv_id)];
                     current_row.push_back(human_readable ? unit_format(raw_data) : std::to_string(raw_data));
                 }
+                insertDateTime(current_row, CsvOutputType::Data);
                 result.push_back(build_csv_row(current_row, csv_delimiter));
             }
         }

src/utils.h

@@ -405,31 +405,37 @@ inline void choose(const CsvOutputType outputType, H1 h1Func, H2 h2Func, D dataF
     }
 }
 
-inline void printDateForCSV(const CsvOutputType outputType, std::string separator = std::string(","))
+inline void printDateForCSV(const CsvOutputType outputType, std::string separator = std::string(","), std::string * out = nullptr)
 {
+    std::ostringstream strstr;
+    std::ostream & stdcout = out ? strstr : std::cout;
     choose(outputType,
-        [&separator]() {
-            std::cout << separator << separator; // Time
+        [&separator, &stdcout]() {
+            stdcout << separator << separator; // Time
         },
-        [&separator]() {
-            std::cout << "Date" << separator << "Time" << separator;
+        [&separator, &stdcout]() {
+            stdcout << "Date" << separator << "Time" << separator;
         },
-        [&separator]() {
+        [&separator, &stdcout]() {
             std::pair<tm, uint64> tt{ pcm_localtime() };
-            std::cout.precision(3);
-            char old_fill = std::cout.fill('0');
-            std::cout <<
+            stdcout.precision(3);
+            char old_fill = stdcout.fill('0');
+            stdcout <<
                 std::setw(4) <<  1900 + tt.first.tm_year << '-' <<
                 std::setw(2) << 1 + tt.first.tm_mon << '-' <<
                 std::setw(2) << tt.first.tm_mday << separator <<
                 std::setw(2) << tt.first.tm_hour << ':' <<
                 std::setw(2) << tt.first.tm_min << ':' <<
                 std::setw(2) << tt.first.tm_sec << '.' <<
                 std::setw(3) << tt.second << separator; // milliseconds
-            std::cout.fill(old_fill);
-            std::cout.setf(std::ios::fixed);
-            std::cout.precision(2);
+            stdcout.fill(old_fill);
+            stdcout.setf(std::ios::fixed);
+            stdcout.precision(2);
         });
+        if (out)
+        {
+            *out = strstr.str();
+        }
 }
 
 inline void printDateForJson(const std::string& separator, const std::string &jsonSeparator)