New upstream version 3.0.3upstream/3.0.3

1 files changed, 34 insertions, 11 deletions

diff --git a/solaris/Platform.h b/solaris/Platform.h
index dd8614d..c338115 100644
--- a/solaris/Platform.h
+++ b/solaris/Platform.h
@@ -5,17 +5,23 @@ htop - solaris/Platform.h
 (C) 2014 Hisham H. Muhammad
 (C) 2015 David C. Hunt
 (C) 2017,2018 Guy M. Broome
-Released under the GNU GPL, see the COPYING file
+Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "Action.h"
-#include "BatteryMeter.h"
-#include "SignalsPanel.h"
+#include <libproc.h>
 #include <signal.h>
+#include <stdbool.h>
 #include <sys/mkdev.h>
 #include <sys/proc.h>
-#include <libproc.h>
+#include <sys/types.h>
+
+#include "Action.h"
+#include "BatteryMeter.h"
+#include "DiskIOMeter.h"
+#include "ProcessLocksScreen.h"
+#include "SignalsPanel.h"
+
 
 #define  kill(pid, signal) kill(pid / 1024, signal)
 
@@ -26,7 +32,7 @@ typedef struct envAccum_ {
    size_t capacity;
    size_t size;
    size_t bytes;
-   char *env;
+   char* env;
 } envAccum;
 
 extern double plat_loadavg[3];
@@ -37,19 +43,23 @@ extern const unsigned int Platform_numberOfSignals;
 
 extern ProcessField Platform_defaultFields[];
 
-extern MeterClass* Platform_meterTypes[];
-
-void Platform_setBindings(Htop_Action* keys);
+extern const MeterClass* const Platform_meterTypes[];
 
 extern int Platform_numberOfFields;
 
 extern char Process_pidFormat[20];
 
-int Platform_getUptime();
+void Platform_init(void);
+
+void Platform_done(void);
+
+void Platform_setBindings(Htop_Action* keys);
+
+int Platform_getUptime(void);
 
 void Platform_getLoadAverage(double* one, double* five, double* fifteen);
 
-int Platform_getMaxPid();
+int Platform_getMaxPid(void);
 
 double Platform_setCPUValues(Meter* this, int cpu);
 
@@ -63,4 +73,17 @@ void Platform_setZfsCompressedArcValues(Meter* this);
 
 char* Platform_getProcessEnv(pid_t pid);
 
+char* Platform_getInodeFilename(pid_t pid, ino_t inode);
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid);
+
+bool Platform_getDiskIO(DiskIOData* data);
+
+bool Platform_getNetworkIO(unsigned long int* bytesReceived,
+                           unsigned long int* packetsReceived,
+                           unsigned long int* bytesTransmitted,
+                           unsigned long int* packetsTransmitted);
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC);
+
 #endif