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

Fix issue with inconsistent displayTreeSet

This commit is contained in:
Maxim Zhiburt 2020-11-22 21:36:07 +03:00 committed by BenBE
parent cf306ff86e
commit 4907d90cff
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ProcessList.c
View File

@ -241,6 +241,10 @@ static void ProcessList_updateTreeSetLayer(ProcessList* this, unsigned int leftB
} }
Hashtable_put(this->draftingTreeSet, proc->tree_index, proc); Hashtable_put(this->draftingTreeSet, proc->tree_index, proc);
// It's not strictly necessary to do this, but doing so anyways
// allows for checking the correctness of the inner workings.
Hashtable_remove(this->displayTreeSet, newLeftBound);
} }
Vector_delete(layer); Vector_delete(layer);
@ -249,15 +253,20 @@ static void ProcessList_updateTreeSetLayer(ProcessList* this, unsigned int leftB
static void ProcessList_updateTreeSet(ProcessList* this) { static void ProcessList_updateTreeSet(ProcessList* this) {
unsigned int index = 0; unsigned int index = 0;
unsigned int tree_index = 1; unsigned int tree_index = 1;
int vsize = Vector_size(this->processes);
ProcessList_updateTreeSetLayer(this, 0, vsize, 0, 0, vsize*2+1, &index, &tree_index, -1); const int vsize = Vector_size(this->processes);
assert((int)Hashtable_count(this->draftingTreeSet) == vsize);
for(int i = 0; i < vsize; i++) { assert(Hashtable_count(this->draftingTreeSet) == 0);
Process* proc = (Process*)Hashtable_remove(this->draftingTreeSet, i); assert((int)Hashtable_count(this->displayTreeSet) == vsize);
Hashtable_put(this->displayTreeSet, i, proc);
} ProcessList_updateTreeSetLayer(this, 0, vsize, 0, 0, vsize * 2 + 1, &index, &tree_index, -1);
Hashtable* tmp = this->draftingTreeSet;
this->draftingTreeSet = this->displayTreeSet;
this->displayTreeSet = tmp;
assert(Hashtable_count(this->draftingTreeSet) == 0);
assert((int)Hashtable_count(this->displayTreeSet) == vsize);
} }
static void ProcessList_buildTreeBranch(ProcessList* this, pid_t pid, int level, int indent, int direction, bool show, int* node_counter, int* node_index) { static void ProcessList_buildTreeBranch(ProcessList* this, pid_t pid, int level, int indent, int direction, bool show, int* node_counter, int* node_index) {
@ -530,5 +539,11 @@ void ProcessList_scan(ProcessList* this, bool pauseProcessUpdate) {
} }
} }
// Clear out the hashtable to avoid any left-over processes from previous build
//
// The sorting algorithm relies on the fact that
// len(this->displayTreeSet) == len(this->processes)
Hashtable_clear(this->displayTreeSet);
ProcessList_buildTree(this); ProcessList_buildTree(this);
} }