Remove old memory debugging routines. We have Valgrind nowadays.

AffinityPanel.c

@@ -8,7 +8,6 @@ in the source distribution for its full text.
 #include "AffinityPanel.h"
 
 #include "CheckItem.h"
-#include "debug.h"
 
 #include <assert.h>
 #include <string.h>

AvailableColumnsPanel.c

@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "Header.h"
 #include "ColumnsPanel.h"
-#include "debug.h"
 
 #include <assert.h>
 #include <stdlib.h>

AvailableMetersPanel.c

@@ -10,7 +10,6 @@ in the source distribution for its full text.
 #include "CPUMeter.h"
 #include "Header.h"
 #include "ListItem.h"
-#include "debug.h"
 
 #include <assert.h>
 #include <stdlib.h>

BatteryMeter.c

@@ -12,7 +12,6 @@ This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com).
 #include "ProcessList.h"
 #include "CRT.h"
 #include "String.h"
-#include "debug.h"
 
 #include <string.h>
 #include <stdlib.h>

CPUMeter.c

@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "ProcessList.h"
-#include "debug.h"
 
 #include <assert.h>
 #include <stdlib.h>

CRT.c

@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "config.h"
 #include "String.h"
-#include "debug.h"
 
 #include <curses.h>
 #include <signal.h>

CategoriesPanel.c

@@ -13,7 +13,6 @@ in the source distribution for its full text.
 #include "ColumnsPanel.h"
 #include "ColorsPanel.h"
 #include "AvailableColumnsPanel.h"
-#include "debug.h"
 
 #include <assert.h>
 #include <stdlib.h>

CheckItem.c

@@ -8,7 +8,6 @@ in the source distribution for its full text.
 #include "CheckItem.h"
 
 #include "CRT.h"
-#include "debug.h"
 
 #include <assert.h>
 #include <stdlib.h>

ClockMeter.c

@@ -8,7 +8,6 @@ in the source distribution for its full text.
 #include "ClockMeter.h"
 
 #include "CRT.h"
-#include "debug.h"
 
 #include <time.h>
 

ColorsPanel.c

@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "CheckItem.h"
-#include "debug.h"
 
 #include <assert.h>
 #include <stdlib.h>

ColumnsPanel.c

@@ -8,7 +8,6 @@ in the source distribution for its full text.
 #include "ColumnsPanel.h"
 
 #include "String.h"
-#include "debug.h"
 
 #include <assert.h>
 #include <stdlib.h>

DebugMemory.c

@@ -1,236 +0,0 @@
-/*
-htop - DebugMemory.c
-(C) 2004-2011 Hisham H. Muhammad
-Released under the GNU GPL, see the COPYING file
-in the source distribution for its full text.
-*/
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <assert.h>
-
-#undef strdup
-#undef malloc
-#undef realloc
-#undef calloc
-#undef free
-
-#include "DebugMemory.h"
-
-/*{
-
-typedef struct DebugMemoryItem_ DebugMemoryItem;
-
-struct DebugMemoryItem_ {
-   int magic;
-   void* data;
-   char* file;
-   int line;
-   DebugMemoryItem* next;
-};
-
-typedef struct DebugMemory_ {
-   DebugMemoryItem* first;
-   int allocations;
-   int deallocations;
-   int size;
-   bool totals;
-   FILE* file;
-} DebugMemory;
-
-}*/
-
-#if defined(DEBUG)
-
-static DebugMemory* singleton = NULL;
-
-void DebugMemory_new() {
-   if (singleton)
-      return;
-   singleton = malloc(sizeof(DebugMemory));
-   singleton->first = NULL;
-   singleton->allocations = 0;
-   singleton->deallocations = 0;
-   singleton->size = 0;
-   #ifdef DEBUG_ALLOC
-   singleton->file = fopen("/tmp/htop-debug-alloc.txt", "w");
-   #else
-   singleton->file = NULL;
-   #endif
-   singleton->totals = true;
-   //singleton->file = NULL;
-}
-
-void* DebugMemory_malloc(int size, char* file, int line, char* str) {
-   void* data = malloc(size);
-   DebugMemory_registerAllocation(data, file, line);
-   if (singleton->file) {
-      if (singleton->totals) fprintf(singleton->file, "%d\t", singleton->size);
-      fprintf(singleton->file, "%d\t%s:%d (%s)\n", size, file, line, str);
-   }
-   return data;
-}
-
-void* DebugMemory_calloc(int a, int b, char* file, int line) {
-   void* data = calloc(a, b);
-   DebugMemory_registerAllocation(data, file, line);
-   if (singleton->file) {
-      if (singleton->totals) fprintf(singleton->file, "%d\t", singleton->size);
-      fprintf(singleton->file, "%d\t%s:%d\n", a*b, file, line);
-   }
-   return data;
-}
-
-void* DebugMemory_realloc(void* ptr, int size, char* file, int line, char* str) {
-   if (ptr != NULL)
-      DebugMemory_registerDeallocation(ptr, file, line);
-   void* data = realloc(ptr, size);
-   DebugMemory_registerAllocation(data, file, line);
-   if (singleton->file) {
-      if (singleton->totals) fprintf(singleton->file, "%d\t", singleton->size);
-      fprintf(singleton->file, "%d\t%s:%d (%s)\n", size, file, line, str);
-   }
-   return data;
-}
-
-void* DebugMemory_strdup(const char* str, char* file, int line) {
-   assert(str);
-   char* data = strdup(str);
-   DebugMemory_registerAllocation(data, file, line);
-   if (singleton->file) {
-      if (singleton->totals) fprintf(singleton->file, "%d\t", singleton->size);
-      fprintf(singleton->file, "%d\t%s:%d\n", (int) strlen(str), file, line);
-   }
-   return data;
-}
-
-void DebugMemory_free(void* data, char* file, int line) {
-   if (!data) return;
-   DebugMemory_registerDeallocation(data, file, line);
-   if (singleton->file) {
-      if (singleton->totals) fprintf(singleton->file, "%d\t", singleton->size);
-      fprintf(singleton->file, "free\t%s:%d\n", file, line);
-   }
-   free(data);
-}
-
-void DebugMemory_assertSize() {
-   if (!singleton->first) {
-      assert (singleton->size == 0);
-   }
-   DebugMemoryItem* walk = singleton->first;
-   int i = 0;
-   while (walk != NULL) {
-      assert(walk->magic == 11061980);
-      i++;
-      walk = walk->next;
-   }
-   assert (i == singleton->size);
-}
-
-int DebugMemory_getBlockCount() {
-   if (!singleton->first) {
-      return 0;
-   }
-   DebugMemoryItem* walk = singleton->first;
-   int i = 0;
-   while (walk != NULL) {
-      assert(walk->magic == 11061980);
-      i++;
-      walk = walk->next;
-   }
-   return i;
-}
-
-void DebugMemory_registerAllocation(void* data, char* file, int line) {
-   if (!singleton)
-      DebugMemory_new();
-   DebugMemory_assertSize();
-   DebugMemoryItem* item = (DebugMemoryItem*) malloc(sizeof(DebugMemoryItem));
-   item->magic = 11061980;
-   item->data = data;
-   item->file = file;
-   item->line = line;
-   item->next = NULL;
-   int val = DebugMemory_getBlockCount();
-   if (singleton->first == NULL) {
-      assert (val == 0);
-      singleton->first = item;
-   } else {
-      DebugMemoryItem* walk = singleton->first;
-      while (true) {
-         if (walk->next == NULL) {
-            walk->next = item;
-            break;
-         }
-         assert(walk->magic == 11061980);
-         walk = walk->next;
-      }
-   }
-   int nval = DebugMemory_getBlockCount();
-   assert(nval == val + 1);
-   singleton->allocations++;
-   singleton->size++;
-   DebugMemory_assertSize();
-}
-
-void DebugMemory_registerDeallocation(void* data, char* file, int line) {
-   assert(singleton);
-   assert(singleton->first);
-   DebugMemoryItem* walk = singleton->first;
-   DebugMemoryItem* prev = NULL;
-   int val = DebugMemory_getBlockCount();
-   while (walk != NULL) {
-      assert(walk->magic == 11061980);
-      if (walk->data == data) {
-         if (prev == NULL) {
-            singleton->first = walk->next;
-         } else {
-            prev->next = walk->next;
-         }
-         free(walk);
-         assert(DebugMemory_getBlockCount() == val - 1);
-         singleton->deallocations++;
-         singleton->size--;
-         DebugMemory_assertSize();
-         return;
-      }
-      DebugMemoryItem* tmp = walk;
-      walk = walk->next;
-      prev = tmp;
-   }
-   DebugMemory_report();
-   fprintf(stderr, "Couldn't find allocation for memory freed at %s:%d\n", file, line);
-   assert(false);
-}
-
-void DebugMemory_report() {
-   assert(singleton);
-   DebugMemoryItem* walk = singleton->first;
-   int i = 0;
-   while (walk != NULL) {
-      assert(walk->magic == 11061980);
-      i++;
-      fprintf(stderr, "%p %s:%d\n", walk->data, walk->file, walk->line);
-      DebugMemoryItem* old = walk;
-      walk = walk->next;
-      free(old->file);
-      free(old);
-   }
-   fprintf(stderr, "Total:\n");
-   fprintf(stderr, "%d allocations\n", singleton->allocations);
-   fprintf(stderr, "%d deallocations\n", singleton->deallocations);
-   fprintf(stderr, "%d size\n", singleton->size);
-   fprintf(stderr, "%d non-freed blocks\n", i);
-   if (singleton->file)
-      fclose(singleton->file);
-   free(singleton);
-}
-
-#elif defined(DEBUGLITE)
-
-//#include "efence.h"
-
-#endif

DebugMemory.h

@@ -1,69 +0,0 @@
-/* Do not edit this file. It was automatically generated. */
-
-#ifndef HEADER_DebugMemory
-#define HEADER_DebugMemory
-/*
-htop - DebugMemory.h
-(C) 2004-2011 Hisham H. Muhammad
-Released under the GNU GPL, see the COPYING file
-in the source distribution for its full text.
-*/
-
-#undef strdup
-#undef malloc
-#undef realloc
-#undef calloc
-#undef free
-
-
-typedef struct DebugMemoryItem_ DebugMemoryItem;
-
-struct DebugMemoryItem_ {
-   int magic;
-   void* data;
-   char* file;
-   int line;
-   DebugMemoryItem* next;
-};
-
-typedef struct DebugMemory_ {
-   DebugMemoryItem* first;
-   int allocations;
-   int deallocations;
-   int size;
-   bool totals;
-   FILE* file;
-} DebugMemory;
-
-
-#if defined(DEBUG)
-
-void DebugMemory_new();
-
-void* DebugMemory_malloc(int size, char* file, int line, char* str);
-
-void* DebugMemory_calloc(int a, int b, char* file, int line);
-
-void* DebugMemory_realloc(void* ptr, int size, char* file, int line, char* str);
-
-void* DebugMemory_strdup(const char* str, char* file, int line);
-
-void DebugMemory_free(void* data, char* file, int line);
-
-void DebugMemory_assertSize();
-
-int DebugMemory_getBlockCount();
-
-void DebugMemory_registerAllocation(void* data, char* file, int line);
-
-void DebugMemory_registerDeallocation(void* data, char* file, int line);
-
-void DebugMemory_report();
-
-#elif defined(DEBUGLITE)
-
-//#include "efence.h"
-
-#endif
-
-#endif

DisplayOptionsPanel.c

@@ -8,7 +8,6 @@ in the source distribution for its full text.
 #include "DisplayOptionsPanel.h"
 
 #include "CheckItem.h"
-#include "debug.h"
 
 #include <assert.h>
 #include <stdlib.h>

FunctionBar.c

@@ -8,7 +8,6 @@ in the source distribution for its full text.
 #include "FunctionBar.h"
 
 #include "CRT.h"
-#include "debug.h"
 
 #include <assert.h>
 #include <string.h>

Hashtable.c

@@ -7,8 +7,6 @@ in the source distribution for its full text.
 
 #include "Hashtable.h"
 
-#include "debug.h"
-
 #include <stdlib.h>
 #include <assert.h>
 

Header.c

@@ -18,7 +18,6 @@ in the source distribution for its full text.
 #include "ClockMeter.h"
 #include "HostnameMeter.h"
 #include "String.h"
-#include "debug.h"
 
 #include <assert.h>
 #include <time.h>

HostnameMeter.c

@@ -8,7 +8,6 @@ in the source distribution for its full text.
 #include "HostnameMeter.h"
 
 #include "CRT.h"
-#include "debug.h"
 
 #include <unistd.h>
 

ListItem.c

@@ -10,7 +10,6 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "String.h"
 #include "RichString.h"
-#include "debug.h"
 
 #include <string.h>
 #include <assert.h>

LoadAverageMeter.c

@@ -8,7 +8,6 @@ in the source distribution for its full text.
 #include "LoadAverageMeter.h"
 
 #include "CRT.h"
-#include "debug.h"
 
 #include <curses.h>
 #include <assert.h>

Makefile.am

@@ -10,12 +10,11 @@ applications_DATA = htop.desktop
 pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = htop.png
 
-htop_CFLAGS = -pedantic -Wall -Wextra -std=c99 -rdynamic -D_XOPEN_SOURCE_EXTENDED
+htop_CFLAGS = -pedantic -Wall -Wextra -std=c99 -rdynamic -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\"
-AM_CFLAGS = 
+AM_CPPFLAGS = -DNDEBUG
-AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
 
 myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \
-ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c DebugMemory.c \
+ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c \
 DisplayOptionsPanel.c FunctionBar.c Hashtable.c Header.c htop.c ListItem.c \
 LoadAverageMeter.c MemoryMeter.c Meter.c MetersPanel.c Object.c Panel.c \
 BatteryMeter.c Process.c ProcessList.c RichString.c ScreenManager.c Settings.c \
@@ -25,7 +24,7 @@ HostnameMeter.c OpenFilesScreen.c Affinity.c
 
 myhtopheaders = AvailableColumnsPanel.h AvailableMetersPanel.h \
 CategoriesPanel.h CheckItem.h ClockMeter.h ColorsPanel.h ColumnsPanel.h \
-CPUMeter.h CRT.h DebugMemory.h DisplayOptionsPanel.h FunctionBar.h \
+CPUMeter.h CRT.h DisplayOptionsPanel.h FunctionBar.h \
 Hashtable.h Header.h htop.h ListItem.h LoadAverageMeter.h MemoryMeter.h \
 BatteryMeter.h Meter.h MetersPanel.h Object.h Panel.h ProcessList.h RichString.h \
 ScreenManager.h Settings.h SignalsPanel.h String.h \
@@ -35,19 +34,13 @@ Process.h AffinityPanel.h HostnameMeter.h OpenFilesScreen.h Affinity.h
 SUFFIXES = .h
 
 BUILT_SOURCES = $(myhtopheaders)
-htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h debug.h
+htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h
 
 profile:
-	$(MAKE) all CFLAGS="-pg -O2"
+	$(MAKE) all CFLAGS="" AM_CPPFLAGS="-pg -O2"
 
 debug:
-	$(MAKE) all CFLAGS="-ggdb -DDEBUG"
+	$(MAKE) all CFLAGS="" AM_CPPFLAGS="-ggdb -DDEBUG"
-
-hardened-debug:
-	$(MAKE) all CFLAGS="-ggdb -DDEBUG" LDFLAGS="-nopie"
- 
-debuglite:
-	$(MAKE) all CFLAGS="-ggdb -DDEBUGLITE"
 
 .c.h:
 	scripts/MakeHeader.py $<

MemoryMeter.c

@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "ProcessList.h"
-#include "debug.h"
 
 #include <stdlib.h>
 #include <curses.h>

Meter.c

@@ -21,7 +21,6 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "String.h"
 #include "ListItem.h"
-#include "debug.h"
 
 #include <math.h>
 #include <string.h>

MetersPanel.c

@@ -7,8 +7,6 @@ in the source distribution for its full text.
 
 #include "MetersPanel.h"
 
-#include "debug.h"
-
 #include <stdlib.h>
 #include <assert.h>
 

Object.c

@@ -8,7 +8,6 @@ in the source distribution for its full text.
 #include "Object.h"
 
 #include "CRT.h"
-#include "debug.h"
 
 #include <stdlib.h>
 #include <stdio.h>

Panel.c

@@ -11,7 +11,6 @@ in the source distribution for its full text.
 #include "RichString.h"
 #include "ListItem.h"
 #include "String.h"
-#include "debug.h"
 
 #include <math.h>
 #include <stdbool.h>

Process.c

@@ -11,7 +11,6 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "String.h"
 #include "RichString.h"
-#include "debug.h"
 
 #include <stdio.h>
 #include <sys/time.h>

ProcessList.c

@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "String.h"
-#include "debug.h"
 
 #include <sys/time.h>
 #include <sys/utsname.h>

RichString.c

@@ -16,7 +16,6 @@ in the source distribution for its full text.
 #include "config.h"
 #include <ctype.h>
 
-#include "debug.h"
 #include <assert.h>
 #ifdef HAVE_NCURSESW_CURSES_H
 #include <ncursesw/curses.h>

RichString.h

@@ -14,7 +14,6 @@ in the source distribution for its full text.
 #include "config.h"
 #include <ctype.h>
 
-#include "debug.h"
 #include <assert.h>
 #ifdef HAVE_NCURSESW_CURSES_H
 #include <ncursesw/curses.h>

ScreenManager.c

@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "Panel.h"
 #include "Object.h"
-#include "debug.h"
 
 #include <assert.h>
 #include <time.h>

Settings.c

@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "String.h"
 #include "Vector.h"
-#include "debug.h"
 
 #include <sys/stat.h>
 #include <stdlib.h>

SignalsPanel.c

@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "ListItem.h"
 #include "RichString.h"
-#include "debug.h"
 
 #include <stdlib.h>
 #include <assert.h>

String.c

@@ -8,7 +8,6 @@ in the source distribution for its full text.
 #include "String.h"
 
 #include "config.h"
-#include "debug.h"
 
 #include <string.h>
 #include <strings.h>

SwapMeter.c

@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "ProcessList.h"
-#include "debug.h"
 
 #include <stdlib.h>
 #include <curses.h>

TasksMeter.c

@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "ProcessList.h"
 #include "CRT.h"
-#include "debug.h"
 
 /*{
 #include "Meter.h"

UptimeMeter.c

@@ -9,7 +9,6 @@ in the source distribution for its full text.
 
 #include "ProcessList.h"
 #include "CRT.h"
-#include "debug.h"
 
 #include <math.h>
 

Vector.c

@@ -7,8 +7,6 @@ in the source distribution for its full text.
 
 #include "Vector.h"
 
-#include "debug.h"
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.65)
-AC_INIT([htop],[1.0],[loderunner@users.sourceforge.net])
+AC_INIT([htop],[1.0.1],[loderunner@users.sourceforge.net])
 
 # The following two lines are required by hwloc scripts
 AC_USE_SYSTEM_EXTENSIONS

debug.h

@@ -1,28 +0,0 @@
-
-#if defined(DEBUG)
-
-   /* Full debug */
-   #include "DebugMemory.h"
-   #define calloc(a, b) DebugMemory_calloc(a, b, __FILE__, __LINE__)
-   #define malloc(x) DebugMemory_malloc(x, __FILE__, __LINE__, #x)
-   #define realloc(x,s) DebugMemory_realloc(x, s, __FILE__, __LINE__, #x)
-   #define strdup(x) DebugMemory_strdup(x, __FILE__, __LINE__)
-   #define free(x) DebugMemory_free(x, __FILE__, __LINE__)
-   #define debug_done() DebugMemory_report(); _nc_freeall()
-
-#elif defined(DEBUGLITE)
-
-   /* Assertions and core only */
-   #ifdef NDEBUG
-   #undef NDEBUG
-   #endif
-   #define debug_done() 
-
-#else
-
-   /* No debugging */
-   #define NDEBUG
-   #define debug_done() 
-
-#endif
-

htop.c

@@ -22,7 +22,6 @@ in the source distribution for its full text.
 #include "TraceScreen.h"
 #include "OpenFilesScreen.h"
 #include "AffinityPanel.h"
-#include "debug.h"
 
 #include <unistd.h>
 #include <math.h>
@@ -914,6 +913,5 @@ int main(int argc, char** argv) {
       ((Object*)killPanel)->delete((Object*)killPanel);
    UsersTable_delete(ut);
    Settings_delete(settings);
-   debug_done();
    return 0;
 }