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

Merge fixes

This commit is contained in:
Hisham Muhammad 2015-02-23 03:53:36 -03:00
parent 8b5b73825e
commit 0a184b769f
7 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Process.c
View File

@ -45,8 +45,6 @@ in the source distribution for its full text.
#include <sys/types.h> #include <sys/types.h>
typedef struct Settings_ Settings;
#define PROCESS_FLAG_IO 1 #define PROCESS_FLAG_IO 1
#define PROCESS_FLAG_IOPRIO 2 #define PROCESS_FLAG_IOPRIO 2
#define PROCESS_FLAG_OPENVZ 4 #define PROCESS_FLAG_OPENVZ 4
@ -660,7 +658,7 @@ ObjectClass Process_class = {
.compare = Process_compare .compare = Process_compare
}; };
void Process_init(Process* this, struct Settings_* settings, struct ProcessList_* pl) { void Process_init(Process* this, struct ProcessList_* pl) {
this->pid = 0; this->pid = 0;
this->pl = pl; this->pl = pl;
this->tag = false; this->tag = false;

4
Process.h
View File

@ -24,8 +24,6 @@ in the source distribution for its full text.
#include <sys/types.h> #include <sys/types.h>
typedef struct Settings_ Settings;
#define PROCESS_FLAG_IO 1 #define PROCESS_FLAG_IO 1
#define PROCESS_FLAG_IOPRIO 2 #define PROCESS_FLAG_IOPRIO 2
#define PROCESS_FLAG_OPENVZ 4 #define PROCESS_FLAG_OPENVZ 4
@ -195,7 +193,7 @@ void Process_done(Process* this);
extern ObjectClass Process_class; extern ObjectClass Process_class;
void Process_init(Process* this, struct Settings_* settings, struct ProcessList_* pl); void Process_init(Process* this, struct ProcessList_* pl);
void Process_toggleTag(Process* this); void Process_toggleTag(Process* this);

4
Settings.c
View File

@ -22,14 +22,14 @@ in the source distribution for its full text.
#include "Header.h" #include "Header.h"
#include <stdbool.h> #include <stdbool.h>
struct Settings_ { typedef struct Settings_ {
char* userSettings; char* userSettings;
ProcessList* pl; ProcessList* pl;
Header* header; Header* header;
int colorScheme; int colorScheme;
int delay; int delay;
bool changed; bool changed;
}; } Settings;
}*/ }*/

4
Settings.h
View File

@ -15,14 +15,14 @@ in the source distribution for its full text.
#include "Header.h" #include "Header.h"
#include <stdbool.h> #include <stdbool.h>
struct Settings_ { typedef struct Settings_ {
char* userSettings; char* userSettings;
ProcessList* pl; ProcessList* pl;
Header* header; Header* header;
int colorScheme; int colorScheme;
int delay; int delay;
bool changed; bool changed;
}; } Settings;
void Settings_delete(Settings* this); void Settings_delete(Settings* this);

6
linux/LinuxProcess.c
View File

@ -27,15 +27,15 @@ typedef struct LinuxProcess_ {
}*/ }*/
LinuxProcess* LinuxProcess_new(Settings* settings, ProcessList* pl) { LinuxProcess* LinuxProcess_new(ProcessList* pl) {
LinuxProcess* this = calloc(sizeof(LinuxProcess), 1); LinuxProcess* this = calloc(sizeof(LinuxProcess), 1);
Process_init(&this->super, settings, pl); Object_setClass(this, Class(Process));
Process_init(&this->super, pl);
return this; return this;
} }
void LinuxProcess_delete(Object* cast) { void LinuxProcess_delete(Object* cast) {
LinuxProcess* this = (LinuxProcess*) this; LinuxProcess* this = (LinuxProcess*) this;
Object_setClass(this, Class(Process));
Process_done((Process*)cast); Process_done((Process*)cast);
free(this); free(this);
} }

2
linux/LinuxProcess.h
View File

@ -20,7 +20,7 @@ typedef struct LinuxProcess_ {
#define Process_delete LinuxProcess_delete #define Process_delete LinuxProcess_delete
LinuxProcess* LinuxProcess_new(Settings* settings); LinuxProcess* LinuxProcess_new(ProcessList* pl);
void LinuxProcess_delete(Object* cast); void LinuxProcess_delete(Object* cast);

2
linux/LinuxProcessList.c
View File

@ -465,7 +465,7 @@ static bool LinuxProcessList_processEntries(ProcessList* this, const char* dirna
process = existingProcess; process = existingProcess;
assert(process->pid == pid); assert(process->pid == pid);
} else { } else {
process = (Process*) LinuxProcess_new(settings, this); process = (Process*) LinuxProcess_new(this);
assert(process->comm == NULL); assert(process->comm == NULL);
process->pid = pid; process->pid = pid;
process->tgid = parent ? parent->pid : pid; process->tgid = parent ? parent->pid : pid;