remove dmalloc support

Dmalloc is a library for debugging allocation problems [0]. Though it can be
useful, these days its functionality is subsumed by Valgrind and Address
Sanitizer. These two are simpler to use and more precise/detailed than dmalloc.

  [0]: https://dmalloc.com/

diff --git a/lib/cgraph/refstr.c b/lib/cgraph/refstr.c
index 0144ccfaff1202b3c6847c5230dcfd99b7b9f284..70a7e05e13010fd47c1e6974cf96902ea458f979 100644 (file)
--- a/lib/cgraph/refstr.c
+++ b/lib/cgraph/refstr.c
@@ -13,10 +13,6 @@
 
 #include <cghdr.h>
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 /*
  * reference counted strings.
  */

diff --git a/lib/common/memory.h b/lib/common/memory.h
index 1a0b3466ac963f890abd7b8376f660662822a8e6..1f0c53c919d45a7a11341f743892f7d1391a3aa1 100644 (file)
--- a/lib/common/memory.h
+++ b/lib/common/memory.h
@@ -23,15 +23,6 @@
 extern "C" {
 #endif
 
-#ifdef DMALLOC
-#define NEW(t)           (t*)calloc(1,sizeof(t))
-#define N_NEW(n,t)       (t*)calloc((n),sizeof(t))
-#define GNEW(t)          (t*)malloc(sizeof(t))
-#define N_GNEW(n,t)      (t*)malloc((n)*sizeof(t))
-#define ALLOC(size,ptr,type) (ptr? (type*)realloc(ptr,(size)*sizeof(type)):(type*)malloc((size)*sizeof(type)))
-#define RALLOC(size,ptr,type) ((type*)realloc(ptr,(size)*sizeof(type)))
-#define ZALLOC(size,ptr,type,osize) (ptr? (type*)recalloc(ptr,(size)*sizeof(type)):(type*)calloc((size),sizeof(type)))
-#else
 #define NEW(t)           (t*)zmalloc(sizeof(t))
 #define N_NEW(n,t)       (t*)zmalloc((n)*sizeof(t))
 #define GNEW(t)          (t*)gmalloc(sizeof(t))
@@ -41,7 +32,6 @@ extern "C" {
 #define ALLOC(size,ptr,type) (ptr? (type*)grealloc(ptr,(size)*sizeof(type)):(type*)gmalloc((size)*sizeof(type)))
 #define RALLOC(size,ptr,type) ((type*)grealloc(ptr,(size)*sizeof(type)))
 #define ZALLOC(size,ptr,type,osize) (ptr? (type*)zrealloc(ptr,size,sizeof(type),osize):(type*)zmalloc((size)*sizeof(type)))
-#endif
 #ifdef GVDLL
 #define extern __declspec(dllexport)
 #else

diff --git a/lib/graph/attribs.c b/lib/graph/attribs.c
index 8a58a0431e63bdcb9dec7ccfd504862bfd52bb93..f9bb9d9c3112aad5d3b6172c12906fd33f45c38a 100644 (file)
--- a/lib/graph/attribs.c
+++ b/lib/graph/attribs.c
@@ -16,10 +16,6 @@
 #define EXTERN
 #include "libgraph.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 Agdict_t *agdictof(void *obj)
 {
     Agdict_t *d = NULL;

diff --git a/lib/graph/edge.c b/lib/graph/edge.c
index 6627d60cce8a197110137b78a28fb1db3f2c646f..490eee0b815fba577f18de6651f30b98afdd5f4c 100644 (file)
--- a/lib/graph/edge.c
+++ b/lib/graph/edge.c
@@ -15,10 +15,6 @@
 
 #include "libgraph.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #if 0
 /* graphs_of_e() is never used - suppress compiler warnings. */
 static void graphs_of_e(Agedge_t * e, Dict_t * g_e, Agraph_t * g)

diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index 861512a1f72ae1ec30b8043a2bacc8c422bf8212..bba49568b01bfe5599a338a0412d4cbd477d5427 100644 (file)
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -15,10 +15,6 @@
 
 #include "libgraph.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 Dtdisc_t agNamedisc = {
     offsetof(Agnode_t, name),
     -1,

diff --git a/lib/graph/lexer.c b/lib/graph/lexer.c
index ef62e0389ed54e2345ca22a2a9d3f3d89843faa0..9df92553f55c81a1c7e05c08327457e0471352c1 100644 (file)
--- a/lib/graph/lexer.c
+++ b/lib/graph/lexer.c
@@ -19,10 +19,6 @@
 #include "triefa.cP"
 #include "agxbuf.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #define InfileName (InputFile?InputFile:"<unknown>")
 
 static FILE *Lexer_fp;

diff --git a/lib/graph/node.c b/lib/graph/node.c
index 21a07b5375e459a873418dd7e4a8c6c63a345a62..9afdd7bc1cc567ab89517b790d0d3ff490da7e0a 100644 (file)
--- a/lib/graph/node.c
+++ b/lib/graph/node.c
@@ -15,10 +15,6 @@
 
 #include "libgraph.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 Agnode_t *agfindnode(Agraph_t * g, char *name)
 {
     Agnode_t *rv;

diff --git a/lib/graph/parser.y b/lib/graph/parser.y
index b53a563d2c996cec15a9bf31a98a2e2c2e465d34..28ba7a00b214dab235f91ef058fb4453d7deb6be 100644 (file)
--- a/lib/graph/parser.y
+++ b/lib/graph/parser.y
@@ -15,10 +15,6 @@
 
 #include       "libgraph.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 static char            *Port;
 static char            In_decl,In_edge_stmt;
 static int             Current_class,Agraph_type;

diff --git a/lib/graph/refstr.c b/lib/graph/refstr.c
index f15c0cc86abe2d91b8ceb9dfb7c243020aabbeb0..1a0b2b3e194261959943a7ace9172a96a49e4756 100644 (file)
--- a/lib/graph/refstr.c
+++ b/lib/graph/refstr.c
@@ -18,10 +18,6 @@
 static unsigned int HTML_BIT;
 static unsigned int CNT_BITS;
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 typedef struct refstr_t {
     Dtlink_t link;
     unsigned int refcnt;

diff --git a/lib/graph/trie.c b/lib/graph/trie.c
index bf0cc03c105ba3baec9db6777ccb996a83db3727..ae94e35d123909dd72cd9575dfc1c09c06422a07 100644 (file)
--- a/lib/graph/trie.c
+++ b/lib/graph/trie.c
@@ -16,10 +16,6 @@
 #include "parser.h"
 #include "triefa.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 TrieState TrieStateTbl[34] = {
     {-1, 0, 0x42058}
     ,

diff --git a/lib/pathplan/cvt.c b/lib/pathplan/cvt.c
index f5115d33d8541989e0876a11fca0e3ef79a5813b..5d22194d145c4eeede5d4f681c4e87d07ea56e31 100644 (file)
--- a/lib/pathplan/cvt.c
+++ b/lib/pathplan/cvt.c
@@ -15,10 +15,6 @@
 #include <stdio.h>
 #include "vis.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 typedef Ppoint_t ilcoord_t;
 
 #ifdef DEBUG

diff --git a/lib/pathplan/inpoly.c b/lib/pathplan/inpoly.c
index d508e66853c08821f05c0a4567fcc311d3bf3cb7..192d1ccea4ab7e98c8868d1e1eb348f28887f076 100644 (file)
--- a/lib/pathplan/inpoly.c
+++ b/lib/pathplan/inpoly.c
@@ -22,10 +22,6 @@
 #include "vispath.h"
 #include "pathutil.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 int in_poly(Ppoly_t poly, Ppoint_t q)
 {
     int i, i1;                 /* point index; i1 = i-1 mod n */

diff --git a/lib/pathplan/route.c b/lib/pathplan/route.c
index 5ab2863f2e8b172a88d60ebfb68482f1f919f238..0a16c61e05b514ee159fd7d1f4a12b84ad201fc4 100644 (file)
--- a/lib/pathplan/route.c
+++ b/lib/pathplan/route.c
@@ -22,10 +22,6 @@
 #include "pathutil.h"
 #include "solvers.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #define EPSILON1 1E-3
 #define EPSILON2 1E-6
 

diff --git a/lib/pathplan/shortest.c b/lib/pathplan/shortest.c
index e0c84128b15d77d7fe60393a2004aca5a7f5e4e6..2a81b7623a674434622de4609c9adb711741e69f 100644 (file)
--- a/lib/pathplan/shortest.c
+++ b/lib/pathplan/shortest.c
@@ -22,10 +22,6 @@
 #include <math.h>
 #include "pathutil.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #define ISCCW 1
 #define ISCW  2
 #define ISON  3

diff --git a/lib/pathplan/shortestpth.c b/lib/pathplan/shortestpth.c
index 85b49b4bf3cfcceca52ac7058c63b79fcce95c49..1d6bd0f5925953e3fd77117cb0c5f3828c30b91c 100644 (file)
--- a/lib/pathplan/shortestpth.c
+++ b/lib/pathplan/shortestpth.c
@@ -14,10 +14,6 @@
 
 #include "vis.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 static COORD unseen = (double) INT_MAX;
 
 /* shortestPath:

diff --git a/lib/pathplan/solvers.c b/lib/pathplan/solvers.c
index e3f6571abb2bf887b82cda061910d1cfd1404c86..619f58dc5ce76da27321efb6684e92f34c319c17 100644 (file)
--- a/lib/pathplan/solvers.c
+++ b/lib/pathplan/solvers.c
@@ -16,10 +16,6 @@
 #include <math.h>
 #include "solvers.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #ifndef HAVE_CBRT
 #define cbrt(x) ((x < 0) ? (-1*pow(-x, 1.0/3.0)) : pow (x, 1.0/3.0))
 #endif

diff --git a/lib/pathplan/triang.c b/lib/pathplan/triang.c
index 71d22d4ecba223f3a42b0a761c286ceeb72b1021..7280243121c34ad79517eadeab45a7fe83397819 100644 (file)
--- a/lib/pathplan/triang.c
+++ b/lib/pathplan/triang.c
@@ -19,10 +19,6 @@
 #include "pathutil.h"
 #include "tri.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 typedef struct lvertex_2_t {
     double x, y;
 } lvertex_2_t;

diff --git a/lib/pathplan/util.c b/lib/pathplan/util.c
index e2d31ce10e1d5f711afefe8afefbcfeb665d02dc..5fabe03d6fa91b68c869e14f7062a464f70f647b 100644 (file)
--- a/lib/pathplan/util.c
+++ b/lib/pathplan/util.c
@@ -16,10 +16,6 @@
 #include <stdlib.h>
 #include "pathutil.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
 #define ALLOC(size,ptr,type) (ptr? (type*)realloc(ptr,(size)*sizeof(type)):(type*)malloc((size)*sizeof(type)))
 
 Ppoly_t copypoly(Ppoly_t argpoly)

diff --git a/lib/pathplan/visibility.c b/lib/pathplan/visibility.c
index ac5743077d943817f18dde35cc74faaab9804af6..d971ffd773697403e4e2a64ce262505dd54e2e75 100644 (file)
--- a/lib/pathplan/visibility.c
+++ b/lib/pathplan/visibility.c
@@ -14,10 +14,6 @@
 
 #include "vis.h"
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
        /* TRANSPARENT means router sees past colinear obstacles */
 #ifdef TRANSPARENT
 #define INTERSECT(a,b,c,d,e) intersect1((a),(b),(c),(d),(e))

diff --git a/lib/rbtree/Makefile.am b/lib/rbtree/Makefile.am
index c940cbaf2bf0cd7b787cbd6274c5c5a013244826..80778ddc2c4194bb230e93ab86a52a20db89d6d8 100644 (file)
--- a/lib/rbtree/Makefile.am
+++ b/lib/rbtree/Makefile.am
@@ -11,4 +11,4 @@ librbtree_C_la_SOURCES = misc.c red_black_tree.c stack.c
 CLEANFILES = inkpot_lib_*.dat
 
 EXTRA_DIST = LICENSE CHANGES makefile.txt test_red_black_tree.c \
-            simple_test.sh test_rb rbtree.vcxproj*
+            test_rb rbtree.vcxproj*

diff --git a/lib/rbtree/makefile.txt b/lib/rbtree/makefile.txt
index cf77a1013a4555bc768b2bb46cb62db970d4c42a..133e9e107041f850ee88495f20c841393c1e4f1b 100755 (executable)
--- a/lib/rbtree/makefile.txt
+++ b/lib/rbtree/makefile.txt
@@ -1,10 +1,6 @@
 
 # prompt> make
 # builds everything and links in test program test_rb
-#
-# prompt> make mem_check
-# Rebuilds everything using dmalloc and does memory testing.
-# Only works if you have dmalloc installed (see http://dmalloc.com).
 
 SRCS = test_red_black_tree.c red_black_tree.c stack.c misc.c
 
@@ -18,35 +14,12 @@ CFLAGS = -g -Wall -pedantic
 
 PROGRAM = test_rb
 
-.PHONY:        mem_check clean
+.PHONY:        clean
 
 all: $(PROGRAM)
 
 $(PROGRAM):    $(OBJS)
-               $(CC) $(CFLAGS) $(OBJS) -o $(PROGRAM) $(DMALLOC_LIB)
-
-mem_check:     
-               @if [ -e makefile.txt ] ; then \
-                       echo "Using makefile.txt" ; \
-                       $(MAKE) clean -f makefile.txt ; \
-                       $(MAKE) $(PROGRAM) "CFLAGS=$(CFLAGS) -DDMALLOC" "DMALLOC_LIB=-ldmalloc" -f makefile.txt ; \
-               else \
-                       echo "Using default makefile (i.e. no -f flag)." ; \
-                       $(MAKE) clean ; \
-                       $(MAKE) $(PROGRAM) "CFLAGS=$(CFLAGS) -DDMALLOC" "DMALLOC_LIB=-ldmalloc" ; \
-               fi
-               ./simple_test.sh
-               @if [ -s unfreed.txt ] ; then \
-                       echo " " ; \
-                       echo "Leaked some memory.  See logfile for details." ;\
-               else \
-                       echo " " ; \
-                       echo "No memory leaks detected. " ;\
-                       echo " " ; \
-                       echo "Test passed. " ; \
-                       echo " " ; \
-               fi
-
+               $(CC) $(CFLAGS) $(OBJS) -o $(PROGRAM)
 
 test_red_black_tree.o: test_red_black_tree.c red_black_tree.c stack.c stack.h red_black_tree.h misc.h
 

diff --git a/lib/rbtree/red_black_tree.h b/lib/rbtree/red_black_tree.h
index ba822a56430f8ff649eca5a20dfdfe8d1d1312b7..2496f542cf95302d29d26529819e580e840430a3 100644 (file)
--- a/lib/rbtree/red_black_tree.h
+++ b/lib/rbtree/red_black_tree.h
@@ -12,9 +12,6 @@
 extern "C" {
 #endif
 
-#ifdef DMALLOC
-#include <dmalloc.h>
-#endif
 #include "misc.h"
 #include "stack.h"
 

diff --git a/lib/rbtree/simple_test.sh b/lib/rbtree/simple_test.sh
deleted file mode 100755 (executable)
index 8610c70..0000000
--- a/lib/rbtree/simple_test.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-eval `dmalloc -l logfile -i 100 high`
-./test_rb<<EOF
-1
-1
-1
-2
-1
-3
-1
-4
-1
-5
-7
-1
-9
-1 
-11
-1 
--87
-3 
-10
-3 
--87
-3 
-6
-4 
-3
-3 
-99
-5 
-2
-5 
-99
-5 
-1
-6
--1
-10
-2
-2
-2
-4
-7
-8
-EOF
-
-grep "not freed" logfile | tee unfreed.txt
-
-echo "DMALLOC_OPTIONS were :"
-printenv DMALLOC_OPTIONS
-
-exit 0
\ No newline at end of file

diff --git a/tclpkg/tclhandle/tclhandle.c b/tclpkg/tclhandle/tclhandle.c
index d28fcdee9302e76e9909321917573a7815d9c7c9..65eea83a8538be1c6c5c0931c9ef37b595e8205a 100644 (file)
--- a/tclpkg/tclhandle/tclhandle.c
+++ b/tclpkg/tclhandle/tclhandle.c
@@ -44,11 +44,6 @@
 /* Added 2000-09-19 by KG for memcpy, ... decls */
 #include <string.h>
 
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
-
 /*
  * Variable set to contain the alignment factor (in bytes) for this machine.
  * It is set on the first table initialization.