Renamed squid.h to squid-old.h and config.h to squid.h

[thirdparty/squid.git] / test-suite / test_tools.cc

diff --git a/test-suite/test_tools.cc b/test-suite/test_tools.cc
index 576fa69f47a598778127d6933e712138c124f5ca..86f415f46e41ceb68b4a3a38ea6e6ff3eb23994b 100644 (file)
--- a/test-suite/test_tools.cc
+++ b/test-suite/test_tools.cc
@@ -1,42 +1,11 @@
-
 /*
- * $Id: test_tools.cc,v 1.4 2003/07/08 23:10:59 hno Exp $
- *
- * AUTHOR: Robert Collins
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- * Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
+ * $Id$
  */
 
-#define _SQUID_EXTERNNEW_
-#include "squid.h"
-#include <iostream>
-#include <sstream>
+// XXX: This file is made of large pieces of src/tools.cc
+// with only a few minor modifications. TODO: redesign or delete.
+
+#include "squid-old.h"
 
 void
 xassert(const char *msg, const char *file, int line)
@@ -45,95 +14,85 @@ xassert(const char *msg, const char *file, int line)
     exit (1);
 }
 
-int Debug::Levels[MAX_DEBUG_SECTIONS];
-int Debug::level;
-
-static void
-_db_print_stderr(const char *format, va_list args);
+dlink_node *
+dlinkNodeNew()
+{
+    return new dlink_node;
+}
 
+/* the node needs to be unlinked FIRST */
 void
-#if STDC_HEADERS
-_db_print(const char *format,...)
+dlinkNodeDelete(dlink_node * m)
 {
-#else
-_db_print(va_alist)
-va_dcl
-{
-    const char *format = NULL;
-#endif
-
-    LOCAL_ARRAY(char, f, BUFSIZ);
-    va_list args1;
-#if STDC_HEADERS
-
-    va_list args2;
-    va_list args3;
-#else
-#define args2 args1
-#define args3 args1
-#endif
-
-#if STDC_HEADERS
-
-    va_start(args1, format);
-
-    va_start(args2, format);
-
-    va_start(args3, format);
+    if (m == NULL)
+        return;
 
-#else
+    delete m;
+}
 
-    format = va_arg(args1, const char *);
+void
+dlinkAdd(void *data, dlink_node * m, dlink_list * list)
+{
+    m->data = data;
+    m->prev = NULL;
+    m->next = list->head;
 
-#endif
+    if (list->head)
+        list->head->prev = m;
 
-    snprintf(f, BUFSIZ, "%s| %s",
-             "stub time", //debugLogTime(squid_curtime),
-             format);
+    list->head = m;
 
-    _db_print_stderr(f, args2);
+    if (list->tail == NULL)
+        list->tail = m;
+}
 
-    va_end(args1);
+void
+dlinkAddAfter(void *data, dlink_node * m, dlink_node * n, dlink_list * list)
+{
+    m->data = data;
+    m->prev = n;
+    m->next = n->next;
+
+    if (n->next)
+        n->next->prev = m;
+    else {
+        assert(list->tail == n);
+        list->tail = m;
+    }
+
+    n->next = m;
+}
 
-#if STDC_HEADERS
+void
+dlinkAddTail(void *data, dlink_node * m, dlink_list * list)
+{
+    m->data = data;
+    m->next = NULL;
+    m->prev = list->tail;
 
-    va_end(args2);
+    if (list->tail)
+        list->tail->next = m;
 
-    va_end(args3);
+    list->tail = m;
 
-#endif
+    if (list->head == NULL)
+        list->head = m;
 }
 
-static void
-_db_print_stderr(const char *format, va_list args) {
-    /* FIXME? */
-   // if (opt_debug_stderr < Debug::level)
-   if (1 < Debug::level)
-        return;
+void
+dlinkDelete(dlink_node * m, dlink_list * list)
+{
+    if (m->next)
+        m->next->prev = m->prev;
 
-    vfprintf(stderr, format, args);
-}
+    if (m->prev)
+        m->prev->next = m->next;
 
-void
-fatal(const char *message) {
-    debug (0,0) ("Fatal: %s",message);
-    exit (1);
-}
+    if (m == list->head)
+        list->head = m->next;
 
-std::ostream &
-Debug::getDebugOut()
-{
-    assert (CurrentDebug == NULL);
-    CurrentDebug = new std::ostringstream();
-    return *CurrentDebug;
-}
+    if (m == list->tail)
+        list->tail = m->prev;
 
-void
-Debug::finishDebug()
-{
-    _db_print("%s\n", CurrentDebug->str().c_str());
-    delete CurrentDebug;
-    CurrentDebug = NULL;
+    m->next = m->prev = NULL;
 }
-
-std::ostringstream *Debug::CurrentDebug (NULL);