Removed memory test

ChangeLog

@@ -5,6 +5,9 @@
 
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140304 ]
+	* Removed memory test
+
 	[ 20140303 ]
 	* Removed Map.h & Tree.h, using std::map instead...
 

Makefile

@@ -65,7 +65,6 @@ BUILD_DEBUG_DIR=bin/debug
 BUILD_RELEASE_DIR=bin/release
 BUILD_PROF_DIR=bin/prof
 BUILD_TEST_DIR=bin/test
-BUILD_MEM_DIR=bin/mem
 BUILD_INSTALL_DIR=bin/$(BUILD_SELECT)
 DEB_DIR=/tmp/$(NAME).deb
 
@@ -154,15 +153,6 @@ ded:
 	CFLAGS="$(DEBUG_CFLAGS) -DDEDICATED_SERVER" \
 	LD_FLAGS="$(LD_FLAGS)"
 
-# -DDEBUG_MEMORY_VERBOSE
-# -DDEBUG_MEMORY
-memory:
-	@-mkdir -p $(BUILD_MEM_DIR)
-	$(MAKE) targets BUILDDIR=$(BUILD_MEM_DIR) \
-	DEBUG_OBJ="$(BUILD_MEM_DIR)/memory_test.o" \
-	CFLAGS="$(DEBUG_CFLAGS) -DDEBUG_MEMORY" \
-	LD_FLAGS="$(LD_FLAGS)"
-
 depend:
 	@-echo "Making deps..."
 	@-echo "# Autogenerated dependency file" > depend
@@ -258,7 +248,6 @@ clean-obj:
 	@-rm -f $(BUILD_DEBUG_DIR)/*.o
 	@-rm -f $(BUILD_RELEASE_DIR)/*.o
 	@-rm -f $(BUILD_TEST_DIR)/*.o
-	@-rm -f $(BUILD_MEM_DIR)/*.o
 	@-echo "[DONE]"
 
 clean-build:
@@ -266,7 +255,6 @@ clean-build:
 	@-rm -f $(BUILD_PROF_DIR)/$(NAME)
 	@-rm -f $(BUILD_DEBUG_DIR)/$(NAME)
 	@-rm -f $(BUILD_RELEASE_DIR)/$(NAME)
-	@-rm -f $(BUILD_MEM_DIR)/$(NAME)
 	@-echo "[DONE]"
 
 clean-doc:
@@ -311,13 +299,10 @@ TEST_MAP_TR3=~/.OpenRaider/paks/tr3/scotland.tr2
 TEST_MAP_TR2=~/.OpenRaider/paks/tr2/unwater.tr2
 TEST_MAP_TR1=~/.OpenRaider/paks/tr1/level1.phd
 
-test.build: Matrix.test Math.test Memory.test Network.test Sound.test tga.test GLString.test TombRaider.test
+test.build: Matrix.test Math.test Network.test Sound.test tga.test GLString.test TombRaider.test
 
 test: test.build
 	@-echo "================================================="
-	@-echo "Running Memory unit test"
-	$(BUILD_TEST_DIR)/memory_test.test
-	@-echo "================================================="
 	@-echo "Running Matrix unit test"
 	$(BUILD_TEST_DIR)/Matrix.test
 	@-echo "================================================="
@@ -344,13 +329,13 @@ TombRaider.reg_test:
 	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR4) > /tmp/log.tr4
 	$(BUILD_TEST_DIR)/TombRaider.test load $(TEST_MAP_TR5) > /tmp/log.tr5
 
-TR_FLAGS = -D__TEST_TR5_DUMP_TGA -D__TEST_32BIT_TEXTILES -DDEBUG_MEMORY
+TR_FLAGS = -D__TEST_TR5_DUMP_TGA -D__TEST_32BIT_TEXTILES
 
 TombRaider.test:
 	@-mkdir -p $(BUILD_TEST_DIR)
 	$(CC) $(FLAGS_ALL) $(WARNINGS) -Iinclude $(TR_FLAGS) -o $(BUILD_TEST_DIR)/TombRaiderTest.o -c test/TombRaider.cpp
 	$(MAKE) targets NAME=TombRaider.test BUILDDIR=$(BUILD_TEST_DIR) \
-	OBJS="$(BUILD_TEST_DIR)/TombRaiderTest.o $(BUILD_TEST_DIR)/TombRaider.o $(BUILD_TEST_DIR)/tga.o $(BUILD_TEST_DIR)/memory_test.o" \
+	OBJS="$(BUILD_TEST_DIR)/TombRaiderTest.o $(BUILD_TEST_DIR)/TombRaider.o $(BUILD_TEST_DIR)/tga.o" \
 	CFLAGS="$(BASE_CFLAGS) -g $(TR_FLAGS)" \
 	LD_FLAGS="-lz -lstdc++"
 
@@ -381,14 +366,6 @@ Math.test:
 
 #################################################################
 
-Memory.test:
-	mkdir -p $(BUILD_TEST_DIR)
-	$(CC) $(FLAGS_ALL) $(WARNINGS) -g -lstdc++ -Iinclude \
-	-DDEBUG_MEMORY -DDEBUG_MEMORY_ERROR \
-	src/memory_test.cpp test/memory_test.cpp -o $(BUILD_TEST_DIR)/memory_test.test
-
-#################################################################
-
 Network.test:
 	mkdir -p $(BUILD_TEST_DIR)
 	$(CC) $(TEST_FLAGS) $(WARNINGS) src/MatMath.cpp src/Vector3d.cpp \

README.md

@@ -148,7 +148,6 @@ Pressing <UP> will go back to last command entered (saves typing).
 | noclip              | Toggle world clipping in cycle                         |
 | hop                 | Toggle room hopping hack                               |
 | showfps BOOL        | Show FPS                                               |
-| mem ARG             | Prints memory report, where ARG is `usage` or `report` |
 | resize STRING       | Change resolution to `xga`, `svga` or `vga`            |
 
 #### Render

include/List.h

@@ -15,10 +15,6 @@
 #include <limits.h>
 #include <stdio.h>
 
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
 /*!
  * \brief Template class encapsulating a single list node
  * \tparam T encapsulated data type

include/Vector.h

@@ -11,10 +11,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
 /*!
  * \brief Template class for a (pretty strange) Vector
  * \tparam Object datatype the Vector can store

include/memory_test.h

@@ -1,84 +0,0 @@
-/*!
- * \file include/memory_test.h
- * Memory testing Toolkit
- *
- * \author Mongoose
- */
-
-#ifndef _MEMORY_TEST_H_
-#define _MEMORY_TEST_H_
-
-#include <cstddef>
-
-#if defined(DEBUG_MEMORY) && !defined(UNIT_TEST_MEMORY)
-
-#define DEBUG_NEW new(__FILE__, __LINE__)
-void *operator new(size_t size, const char *file, int line);
-void *operator new [](size_t size, const char *file, int line);
-
-#define DEBUG_DELETE delete_check(__FILE__, __LINE__, 0);delete
-void operator delete(void *p);
-void operator delete [](void *p);
-
-#else
-
-#define DEBUG_NEW new
-#define DEBUG_DELETE delete
-
-#endif
-
-#define new DEBUG_NEW
-#define delete DEBUG_DELETE
-
-typedef enum {
-    MEMORY_USED_BY_PROGRAM      = 1,
-    MEMORY_USED_BY_OVERHEAD     = 2,
-    MEMORY_USED_TOTAL           = 3,
-    MAX_MEMORY_USED_BY_PROGRAM  = 4,
-    MAX_MEMORY_USED_BY_OVERHEAD = 5
-} memory_query_t;
-
-void delete_check(const char *file, int line, int print);
-
-void display_memory_usage();
-
-/*!
- * \brief Get total memory usage
- * \param query what to return
- * \returns amount of requested memory used
- */
-long memory_used(memory_query_t query);
-
-/*!
- * \brief Dumps raw Tree holding memory accounting
- */
-void dump_memory_report();
-
-#ifdef DEBUG_MEMORY
-
-#define DWORD unsigned long
-#define ZERO_ALLOC_SLOTS 3
-
-typedef enum { RB_BLACK = 0, RB_RED = 1 } rbtree_color_t;
-
-typedef struct rbtree_s {
-    void *data;
-    DWORD key;
-    rbtree_color_t color;
-    struct rbtree_s *left;
-    struct rbtree_s *right;
-    struct rbtree_s *parent;
-} rbtree_t;
-
-typedef struct meminfo_filename_s {
-    char *filename;
-    char filename_len;
-    DWORD size;
-    unsigned int alloc_zero;
-    unsigned int alloc_zero_at_line[ZERO_ALLOC_SLOTS];
-    struct meminfo_filename_s *next;
-} meminfo_filename_t;
-
-#endif
-
-#endif

src/Camera.cpp

@@ -11,11 +11,6 @@
 #include <MatMath.h>
 #include <Camera.h>
 
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
-
 unsigned int Camera::mCounter = 0;
 
 ////////////////////////////////////////////////////////////

src/Emitter.cpp

@@ -18,10 +18,6 @@
 
 #include <Emitter.h>
 
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
 vec_t Emitter::mFrustum[6][4];
 
 int Emitter::compareParticleDist(const void *voidA, const void *voidB) {

src/GLString.cpp

@@ -19,11 +19,6 @@
 #include <Texture.h>
 #include <GLString.h>
 
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
-
 GLString::GLString() {
     _num_string_max = 0;
     _num_string = 0;

src/OpenRaider.cpp

@@ -14,10 +14,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
 #include <World.h>
 #include <SkeletalModel.h>
 #include <TombRaider1.h> // tmp stop-gap
@@ -77,11 +73,6 @@ void killOpenRaiderSingleton()
     //delete OpenRaider::Instance();
 #warning "Can't delete OpenRaider::Instance() without a not-allocated-free error. Something is fishy here..."
 
-#ifdef DEBUG_MEMORY
-    printf("\n[Mongoose MEMORY_DEBUG]\nMemory leak table:\n");
-    dump_memory_report();
-#endif
-
     printf("\nThanks for testing %s\n", VERSION);
     printf("Build date: %s @ %s\n", __DATE__, __TIME__);
     printf("Build host: %s\n", BUILD_HOST);
@@ -1166,20 +1157,11 @@ void OpenRaider::loadLevel(char *mapname)
     // Cache/process sound fx
     processPakSounds();
 
-#ifdef DEBUG_MEMORY
-    // Right before pak is cleared will be highest use or memory
-    display_memory_usage();
-#endif
-
     // Mongoose 2002.01.02, Go ahead and free the TR pak
     m_tombraider.reset();
 
     print(true, "Level pak freed from memory, Starting game...");
 
-#ifdef DEBUG_MEMORY
-    display_memory_usage();
-#endif
-
     /*! \fixme GL call to critical section,
      * needs mutex really -- Mongoose 2002.01.02
      */
@@ -2943,21 +2925,6 @@ void OpenRaider::consoleCommand(char *cmd)
 
         print(false, "World clipping is [OFF]");
     }
-    else if (rc_command("mem", cmd))
-    {
-#ifdef DEBUG_MEMORY
-        if (rc_command("usage", cmd))
-        {
-            display_memory_usage();
-        }
-        else if (rc_command("report", cmd))
-        {
-            dump_memory_report();
-        }
-#else
-        printf("This build isn't DEBUG_MEMORY enabled\n");
-#endif
-    }
     else if (rc_command("loadlevel", cmd))
     {
         loadLevel(cmd);

src/Particle.cpp

@@ -10,11 +10,6 @@
 
 #include <Particle.h>
 
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
-
 Particle::Particle()
 {
     setActive(true);

src/Render.cpp

@@ -20,10 +20,6 @@
 #include <Emitter.h>
 #endif
 
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
 #include <Render.h>
 
 extern entity_t *LARA;

src/SDLSystem.cpp

@@ -10,10 +10,6 @@
 #include <string.h>
 #include <cmath>
 
-#ifdef MEMORY_TEST
-#include <memory_test.h>
-#endif
-
 #include <SDL2/SDL_opengl.h>
 
 #include <MatMath.h>
@@ -355,11 +351,6 @@ void SDLSystem::shutdown(int i) {
     //SDL_QuitSubSystem(SDL_OPENGL);
     //SDL_Quit(); // Moved to atexit() call
 
-    //#ifdef DEBUG_MEMORY
-    //printf("[Mongoose MEMORY_DEBUG]\nUnfreed memory table:\n");
-    //dump_memory_report();
-    //#endif
-
     exit(i);
 }
 

src/SkeletalModel.cpp

@@ -7,10 +7,6 @@
 
 #include <SkeletalModel.h>
 
-#ifdef MEMORY_TEST
-#include <memory_test.h>
-#endif
-
 ////////////////////////////////////////////////////////////
 // Constructors
 ////////////////////////////////////////////////////////////

src/Sound.cpp

@@ -27,12 +27,6 @@
 
 #include <Sound.h>
 
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
-
-
 Sound::Sound()
 {
     mSource[0] = 0;

src/System.cpp

@@ -28,10 +28,6 @@
 #include <sys/time.h>
 #endif
 
-#ifdef MEMORY_TEST
-#include <memory_test.h>
-#endif
-
 #include <MatMath.h>
 #include <System.h>
 

src/Texture.cpp

@@ -10,10 +10,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
 #include <SDL2/SDL_ttf.h>
 
 #ifdef __APPLE__

src/TombRaider.cpp

@@ -58,12 +58,6 @@
 #include <TGA.h>
 #endif
 
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
-
-
 TombRaider::TombRaider()
 {
     _textile8 = NULL;

src/World.cpp

@@ -5,10 +5,6 @@
  * \author Mongoose
  */
 
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
 #include <math.h>
 
 #include <World.h>

src/tga.cpp

@@ -13,10 +13,6 @@
 
 #include <TGA.h>
 
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
 int tga_check(FILE *f) {
     char buffer[10];
 

test/memory_test.cpp

@@ -1,139 +0,0 @@
-/*!
- * \file test/memory_test.cpp
- * Memory testing Toolkit Unit test
- *
- * \author Mongoose
- * \author xythobuz
- */
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "greatest.h"
-#include <memory_test.h>
-
-extern rbtree_t *MEMORY_INFO;
-bool check_red_black_tree(rbtree_t *current, bool valid, bool strict);
-
-int *i, *j, *k;
-float *l, *m, *n;
-
-void integerTeardown(void *) {
-    free(i);
-    free(j);
-    free(k);
-}
-
-void floatTeardown(void *) {
-    free(l);
-    free(m);
-    free(n);
-}
-
-TEST singleInteger() {
-    i = new int;
-    ASSERTm("No valid red-black tree!", check_red_black_tree(MEMORY_INFO, true, true));
-    ASSERT_EQm("Memory-Tracking faulty!", memory_used(MEMORY_USED_BY_PROGRAM), sizeof(int));
-
-    delete i;
-    i = NULL;
-    ASSERTm("No valid red-black tree!", check_red_black_tree(MEMORY_INFO, true, true));
-    ASSERT_EQm("Memory-Tracking faulty!", memory_used(MEMORY_USED_BY_PROGRAM), 0);
-    PASS();
-}
-
-TEST arrayInteger() {
-    i = new int[3];
-    ASSERTm("No valid red-black tree!", check_red_black_tree(MEMORY_INFO, true, true));
-    ASSERT_EQm("Memory-Tracking faulty!", memory_used(MEMORY_USED_BY_PROGRAM), 3 * sizeof(int));
-
-    delete [] i;
-    i = NULL;
-    ASSERTm("No valid red-black tree!", check_red_black_tree(MEMORY_INFO, true, true));
-    ASSERT_EQm("Memory-Tracking faulty!", memory_used(MEMORY_USED_BY_PROGRAM), 0);
-    PASS();
-}
-
-TEST arrayCombinedInteger() {
-    i = new int[3];
-    j = new int;
-    k = new int[3];
-    ASSERTm("No valid red-black tree!", check_red_black_tree(MEMORY_INFO, true, true));
-    ASSERT_EQm("Memory-Tracking faulty!", memory_used(MEMORY_USED_BY_PROGRAM), 7 * sizeof(int));
-
-    delete [] i;
-    delete j;
-    delete [] k;
-    i = NULL;
-    j = NULL;
-    k = NULL;
-    ASSERTm("No valid red-black tree!", check_red_black_tree(MEMORY_INFO, true, true));
-    ASSERT_EQm("Memory-Tracking faulty!", memory_used(MEMORY_USED_BY_PROGRAM), 0);
-    PASS();
-}
-
-SUITE(integerSuite) {
-    SET_TEARDOWN(integerTeardown, NULL);
-    RUN_TEST(singleInteger);
-    RUN_TEST(arrayInteger);
-    RUN_TEST(arrayCombinedInteger);
-}
-
-TEST singleFloat() {
-    l = new float;
-    ASSERTm("No valid red-black tree!", check_red_black_tree(MEMORY_INFO, true, true));
-    ASSERT_EQm("Memory-Tracking faulty!", memory_used(MEMORY_USED_BY_PROGRAM), sizeof(float));
-
-    delete l;
-    l = NULL;
-    ASSERTm("No valid red-black tree!", check_red_black_tree(MEMORY_INFO, true, true));
-    ASSERT_EQm("Memory-Tracking faulty!", memory_used(MEMORY_USED_BY_PROGRAM), 0);
-    PASS();
-}
-
-TEST arrayFloat() {
-    l = new float[3];
-    ASSERTm("No valid red-black tree!", check_red_black_tree(MEMORY_INFO, true, true));
-    ASSERT_EQm("Memory-Tracking faulty!", memory_used(MEMORY_USED_BY_PROGRAM), 3 * sizeof(float));
-
-    delete [] l;
-    l = NULL;
-    ASSERTm("No valid red-black tree!", check_red_black_tree(MEMORY_INFO, true, true));
-    ASSERT_EQm("Memory-Tracking faulty!", memory_used(MEMORY_USED_BY_PROGRAM), 0);
-    PASS();
-}
-
-TEST arrayCombinedFloat() {
-    l = new float[3];
-    m = new float;
-    n = new float[3];
-    ASSERTm("No valid red-black tree!", check_red_black_tree(MEMORY_INFO, true, true));
-    ASSERT_EQm("Memory-Tracking faulty!", memory_used(MEMORY_USED_BY_PROGRAM), 7 * sizeof(float));
-
-    delete [] l;
-    delete m;
-    delete [] n;
-    l = NULL;
-    m = NULL;
-    n = NULL;
-    ASSERTm("No valid red-black tree!", check_red_black_tree(MEMORY_INFO, true, true));
-    ASSERT_EQm("Memory-Tracking faulty!", memory_used(MEMORY_USED_BY_PROGRAM), 0);
-    PASS();
-}
-
-SUITE(floatSuite) {
-    SET_TEARDOWN(floatTeardown, NULL);
-    RUN_TEST(singleFloat);
-    RUN_TEST(arrayFloat);
-    RUN_TEST(arrayCombinedFloat);
-}
-
-GREATEST_MAIN_DEFS();
-
-int main(int argc, char *argv[]) {
-    GREATEST_MAIN_BEGIN();
-    RUN_SUITE(integerSuite);
-    RUN_SUITE(floatSuite);
-    GREATEST_MAIN_END();
-}
-