Change ht_key_t typedef to size_t

This allows a larger hash table. The bit width of keys no longer limited
to 2^32 in 64-bit builds.

Signed-off-by: Kang-Che Sung <explorer09@gmail.com>

Author: Explorer09

Action.c

@@ -113,7 +113,7 @@ static bool changePriority(MainPanel* panel, int delta) {
 static void addUserToVector(ht_key_t key, void* userCast, void* panelCast) {
    const char* user = userCast;
    Panel* panel = panelCast;
-   Panel_add(panel, (Object*) ListItem_new(user, key));
+   Panel_add(panel, (Object*) ListItem_new(user, (int)key));
 }
 
 bool Action_setUserOnly(const char* userName, uid_t* userId) {

AvailableColumnsPanel.c

@@ -91,7 +91,7 @@ static void AvailableColumnsPanel_addDynamicColumn(ht_key_t key, void* value, vo
       xSnprintf(description, sizeof(description), "%s - %s", title, text);
    else
       xSnprintf(description, sizeof(description), "%s", title);
-   Panel_add(&this->super, (Object*) ListItem_new(description, key));
+   Panel_add(&this->super, (Object*) ListItem_new(description, (int)key));
 }
 
 // Handle DynamicColumns entries in the AvailableColumnsPanel

DynamicColumn.c

@@ -46,7 +46,7 @@ void DynamicColumn_done(DynamicColumn* this) {
 typedef struct {
    const char* name;
    const DynamicColumn* data;
-   unsigned int key;
+   ht_key_t key;
 } DynamicIterator;
 
 static void DynamicColumn_compare(ht_key_t key, void* value, void* data) {
@@ -58,7 +58,7 @@ static void DynamicColumn_compare(ht_key_t key, void* value, void* data) {
    }
 }
 
-const DynamicColumn* DynamicColumn_search(Hashtable* dynamics, const char* name, unsigned int* key) {
+const DynamicColumn* DynamicColumn_search(Hashtable* dynamics, const char* name, ht_key_t* key) {
    DynamicIterator iter = { .key = 0, .data = NULL, .name = name };
    if (dynamics)
       Hashtable_foreach(dynamics, DynamicColumn_compare, &iter);
@@ -67,10 +67,10 @@ const DynamicColumn* DynamicColumn_search(Hashtable* dynamics, const char* name,
    return iter.data;
 }
 
-const DynamicColumn* DynamicColumn_lookup(Hashtable* dynamics, unsigned int key) {
+const DynamicColumn* DynamicColumn_lookup(Hashtable* dynamics, ht_key_t key) {
    return (const DynamicColumn*) Hashtable_get(dynamics, key);
 }
 
-bool DynamicColumn_writeField(const Process* proc, RichString* str, unsigned int key) {
+bool DynamicColumn_writeField(const Process* proc, RichString* str, ht_key_t key) {
    return Platform_dynamicColumnWriteField(proc, str, key);
 }

DynamicColumn.h

@@ -36,10 +36,10 @@ const char* DynamicColumn_name(unsigned int key);
 
 void DynamicColumn_done(DynamicColumn* this);
 
-const DynamicColumn* DynamicColumn_lookup(Hashtable* dynamics, unsigned int key);
+const DynamicColumn* DynamicColumn_lookup(Hashtable* dynamics, ht_key_t key);
 
-const DynamicColumn* DynamicColumn_search(Hashtable* dynamics, const char* name, unsigned int* key);
+const DynamicColumn* DynamicColumn_search(Hashtable* dynamics, const char* name, ht_key_t* key);
 
-bool DynamicColumn_writeField(const Process* proc, RichString* str, unsigned int key);
+bool DynamicColumn_writeField(const Process* proc, RichString* str, ht_key_t key);
 
 #endif

DynamicScreen.h

@@ -31,8 +31,8 @@ void DynamicScreen_done(DynamicScreen* this);
 
 void DynamicScreens_addAvailableColumns(Panel* availableColumns, char* screen);
 
-const char* DynamicScreen_lookup(Hashtable* screens, unsigned int key);
+const char* DynamicScreen_lookup(Hashtable* screens, ht_key_t key);
 
-bool DynamicScreen_search(Hashtable* screens, const char* name, unsigned int* key);
+bool DynamicScreen_search(Hashtable* screens, const char* name, ht_key_t* key);
 
 #endif

Hashtable.c

@@ -49,9 +49,9 @@ static void Hashtable_dump(const Hashtable* this) {
 
    size_t items = 0;
    for (size_t i = 0; i < this->size; i++) {
-      fprintf(stderr, "  item %5zu: key = %5u probe = %2zu value = %p\n",
+      fprintf(stderr, "  item %5zu: key = %5zu probe = %2zu value = %p\n",
               i,
-              this->buckets[i].key,
+              (size_t)this->buckets[i].key,
               this->buckets[i].probe,
               this->buckets[i].value);
 

Hashtable.h

@@ -11,7 +11,7 @@ in the source distribution for its full text.
 #include <stddef.h>
 
 
-typedef unsigned int ht_key_t;
+typedef size_t ht_key_t;
 
 typedef void(*Hashtable_PairFunction)(ht_key_t key, void* value, void* userdata);
 

Header.c

@@ -10,6 +10,7 @@ in the source distribution for its full text.
 #include "Header.h"
 
 #include <assert.h>
+#include <limits.h>
 #include <math.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -94,8 +95,10 @@ static void Header_addMeterByName(Header* this, const char* name, MeterModeId mo
                return;    // htoprc parse failure
             *end = '\0';
             const Settings* settings = this->host->settings;
-            if (!DynamicMeter_search(settings->dynamicMeters, dynamic, &param))
+            ht_key_t key;
+            if (!DynamicMeter_search(settings->dynamicMeters, dynamic, &key) || key > UINT_MAX)
                return;    // name lookup failure
+            param = (unsigned int)key;
          } else {
             param = 0;
          }

Process.c

@@ -782,7 +782,7 @@ void Process_writeField(const Process* this, RichString* str, RowField field) {
       xSnprintf(buffer, n, "%-10d ", this->st_uid);
       break;
    default:
-      if (DynamicColumn_writeField(this, str, field))
+      if (DynamicColumn_writeField(this, str, (ht_key_t)field))
          return;
       assert(0 && "Process_writeField: default key reached"); /* should never be reached */
       xSnprintf(buffer, n, "- ");

Settings.c

@@ -209,12 +209,12 @@ static int toFieldIndex(Hashtable* columns, const char* str) {
          char* end;
          if ((end = strrchr(dynamic, ')')) != NULL) {
             bool success;
-            unsigned int key;
+            ht_key_t key;
             *end = '\0';
-            success = DynamicColumn_search(columns, dynamic, &key) != NULL;
+            success = DynamicColumn_search(columns, dynamic, &key) != NULL && key <= INT_MAX;
             *end = ')';
             if (success)
-               return key;
+               return (int)key;
          }
       }
       // Fallback to iterative scan of table of fields by-name.