Merge pull request #35 from A-dead-pixel/oittuser-PR

Add new output formats

Author: Wolf480pl

src/common/Exception.cc

@@ -2,6 +2,7 @@
 
 #include "logger/Logger.h"
 
+#include <cstdint>
 #include <cstring>
 
 namespace s2j {

src/common/Exception.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 namespace s2j {

src/common/ProcFS.cc

@@ -1,5 +1,6 @@
 #include "ProcFS.h"
 
+#include <cstdint>
 #include <fstream>
 #include <functional>
 #include <map>

src/limits/MemoryLimitListener.cc

@@ -12,6 +12,7 @@
 #include <sys/time.h>
 
 #include <csignal>
+#include <cstdint>
 #include <fstream>
 #include <iostream>
 

src/limits/MemoryLimitListener.h

@@ -5,6 +5,8 @@
 #include "seccomp/policy/SyscallPolicy.h"
 #include "tracer/TraceEventListener.h"
 
+#include <cstdint>
+
 namespace s2j {
 namespace limits {
 

src/limits/OutputLimitListener.cc

@@ -8,6 +8,7 @@
 #include "seccomp/filter/LibSeccompFilter.h"
 
 #include <csignal>
+#include <cstdint>
 #include <sys/resource.h>
 #include <sys/time.h>
 

src/limits/OutputLimitListener.h

@@ -4,6 +4,8 @@
 #include "printer/OutputSource.h"
 #include "seccomp/policy/SyscallPolicy.h"
 
+#include <cstdint>
+
 namespace s2j {
 namespace limits {
 

src/limits/ThreadsLimitListener.cc

@@ -7,6 +7,8 @@
 #include "seccomp/action/ActionKill.h"
 #include "seccomp/filter/LibSeccompFilter.h"
 
+#include <cstdint>
+
 namespace s2j {
 namespace limits {
 

src/limits/TimeLimitListener.cc

@@ -8,6 +8,7 @@
 #include <algorithm>
 #include <chrono>
 #include <csignal>
+#include <cstdint>
 #include <ctime>
 #include <fstream>
 #include <limits>
@@ -96,6 +97,8 @@ void TimeLimitListener::onPostExecute() {
     // TODO: run this just after child exit
     auto time = getTimeUsage();
     outputBuilder_->setRealTimeMicroseconds(time->realTimeUs);
+    outputBuilder_->setUserTimeMicroseconds(time->processTimeUs.uTimeUs);
+    outputBuilder_->setSysTimeMicroseconds(time->processTimeUs.sTimeUs);
     verifyTimeUsage(move(time));
 }
 

src/limits/TimeLimitListener.h

@@ -4,6 +4,7 @@
 #include "printer/OutputSource.h"
 
 #include <chrono>
+#include <cstdint>
 
 namespace s2j {
 namespace limits {