zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Solaris: Implement process environment listing

This commit is contained in:
Guy M. Broome 2018-03-29 13:28:43 -04:00 committed by Hisham Muhammad
parent 155d7cbeee
commit 0969f83b21
2 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
solaris/Platform.c
View File

@ -37,12 +37,21 @@ in the source distribution for its full text.
#include "SignalsPanel.h" #include "SignalsPanel.h"
#include <signal.h> #include <signal.h>
#include <sys/mkdev.h> #include <sys/mkdev.h>
#include <sys/proc.h>
#include <libproc.h>
#define kill(pid, signal) kill(pid / 1024, signal) #define kill(pid, signal) kill(pid / 1024, signal)
extern ProcessFieldData Process_fields[]; extern ProcessFieldData Process_fields[];
typedef struct var kvar_t; typedef struct var kvar_t;
typedef struct envAccum_ {
size_t capacity;
size_t size;
size_t bytes;
char *env;
} envAccum;
}*/ }*/
double plat_loadavg[3] = {0}; double plat_loadavg[3] = {0};
@ -211,7 +220,38 @@ void Platform_setSwapValues(Meter* this) {
this->values[0] = pl->usedSwap; this->values[0] = pl->usedSwap;
} }
char* Platform_getProcessEnv(pid_t pid) { static int Platform_buildenv(void *accum, struct ps_prochandle *Phandle, uintptr_t addr, const char *str) {
(void) pid; envAccum *accump = accum;
return "Not (yet) supported on Solaris. Sorry!"; (void) Phandle;
(void) addr;
size_t thissz = strlen(str);
if ((thissz + 2) > (accump->capacity - accump->size))
accump->env = xRealloc(accump->env, accump->capacity *= 2);
if ((thissz + 2) > (accump->capacity - accump->size))
return 1;
strlcpy( accump->env + accump->size, str, (accump->capacity - accump->size));
strncpy( accump->env + accump->size + thissz + 1, "\n", 1);
accump->size = accump->size + thissz + 1;
return 0;
}
char* Platform_getProcessEnv(pid_t pid) {
envAccum envBuilder;
pid_t realpid = pid / 1024;
int graberr;
struct ps_prochandle *Phandle;
if ((Phandle = Pgrab(realpid,PGRAB_RDONLY,&graberr)) == NULL)
return "Unable to read process environment.";
envBuilder.capacity = 4096;
envBuilder.size = 0;
envBuilder.env = xMalloc(envBuilder.capacity);
(void) Penv_iter(Phandle,Platform_buildenv,&envBuilder);
Prelease(Phandle, 0);
strncpy( envBuilder.env + envBuilder.size, "\0", 1);
return envBuilder.env;
} }

9
solaris/Platform.h
View File

@ -16,12 +16,21 @@ in the source distribution for its full text.
#include "SignalsPanel.h" #include "SignalsPanel.h"
#include <signal.h> #include <signal.h>
#include <sys/mkdev.h> #include <sys/mkdev.h>
#include <sys/proc.h>
#include <libproc.h>
#define kill(pid, signal) kill(pid / 1024, signal) #define kill(pid, signal) kill(pid / 1024, signal)
extern ProcessFieldData Process_fields[]; extern ProcessFieldData Process_fields[];
typedef struct var kvar_t; typedef struct var kvar_t;
typedef struct envAccum_ {
size_t capacity;
size_t size;
size_t bytes;
char *env;
} envAccum;
extern double plat_loadavg[3]; extern double plat_loadavg[3];