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

Fixes for /proc location, submitted by Florent Thoumie

This commit is contained in:
Hisham Muhammad 2007-05-17 18:29:30 +00:00
parent df20abfd67
commit 9710a43001
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Process.c
View File

@ -28,7 +28,9 @@ in the source distribution for its full text.
// This works only with glibc 2.1+. On earlier versions
// the behavior is similar to have a hardcoded page size.
#ifndef PAGE_SIZE
#define PAGE_SIZE ( sysconf(_SC_PAGESIZE) / 1024 )
#endif
#define PROCESS_COMM_LEN 300

14
Process.h
View File

@ -31,7 +31,9 @@ in the source distribution for its full text.
// This works only with glibc 2.1+. On earlier versions
// the behavior is similar to have a hardcoded page size.
#ifndef PAGE_SIZE
#define PAGE_SIZE ( sysconf(_SC_PAGESIZE) / 1024 )
#endif
#define PROCESS_COMM_LEN 300
@ -52,16 +54,16 @@ typedef struct Process_ {
struct ProcessList_ *pl;
bool updated;
int pid;
unsigned int pid;
char* comm;
int indent;
char state;
bool tag;
int ppid;
int pgrp;
int session;
int tty_nr;
int tpgid;
unsigned int ppid;
unsigned int pgrp;
unsigned int session;
unsigned int tty_nr;
unsigned int tpgid;
unsigned long int flags;
#ifdef DEBUG
unsigned long int minflt;

6
ProcessList.c
View File

@ -37,11 +37,11 @@ in the source distribution for its full text.
#endif
#ifndef PROCSTATFILE
#define PROCSTATFILE "/proc/stat"
#define PROCSTATFILE PROCDIR "/stat"
#endif
#ifndef PROCMEMINFOFILE
#define PROCMEMINFOFILE "/proc/meminfo"
#define PROCMEMINFOFILE PROCDIR "/meminfo"
#endif
#ifndef MAX_NAME
@ -426,7 +426,7 @@ static int ProcessList_readStatFile(ProcessList* this, Process *proc, FILE *f, c
#else
long int uzero;
int num = ProcessList_read(this, location,
"%c %d %d %d %d %d %lu %lu %lu %lu "
"%c %u %u %u %u %u %lu %lu %lu %lu "
"%lu %lu %lu %ld %ld %ld %ld %ld %ld "
"%lu %lu %ld %lu %lu %lu %lu %lu "
"%lu %lu %lu %lu %lu %lu %lu %lu "

4
ProcessList.h
View File

@ -39,11 +39,11 @@ in the source distribution for its full text.
#endif
#ifndef PROCSTATFILE
#define PROCSTATFILE "/proc/stat"
#define PROCSTATFILE PROCDIR "/stat"
#endif
#ifndef PROCMEMINFOFILE
#define PROCMEMINFOFILE "/proc/meminfo"
#define PROCMEMINFOFILE PROCDIR "/meminfo"
#endif
#ifndef MAX_NAME

2
scripts/MakeHeader.py
View File

@ -21,6 +21,8 @@ class writer:
self.file.write(text + "\n")
out = writer(out)
print("Generating "+name+".h")
selfheader = '#include "' + name + '.h"'
out.write( "/* Do not edit this file. It was automatically generated. */" )