From: Gabe Black <gblack@eecs.umich.edu>
Date: Mon, 30 May 2011 04:48:58 +0000 (-0700)
Subject: Misc: Remove the URL from warnings, fatals, panics, etc.
X-Git-Tag: stable_2012_02_02~296
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8dcbe8adb537dafcadbb97ff87605936fe42b2b7;p=gem5.git

Misc: Remove the URL from warnings, fatals, panics, etc.
---

diff --git a/src/base/misc.cc b/src/base/misc.cc
index 66896103f..97c56c8a0 100644
--- a/src/base/misc.cc
+++ b/src/base/misc.cc
@@ -28,8 +28,6 @@
  * Authors: Nathan Binkert
  */
 
-#include <zlib.h>
-
 #include <cstdlib>
 #include <iostream>
 #include <string>
@@ -70,20 +68,15 @@ __exit_message(const char *prefix, int code,
       default:
         format += "\n";
     }
-    
-    uint32_t crc = crc32(0, (const Bytef*)fmt, strlen(fmt));
 
     format += " @ cycle %d\n[%s:%s, line %d]\n";
     format += "Memory Usage: %ld KBytes\n";
-    format += "For more information see: http://www.m5sim.org/%s/%x\n";
 
     args.push_back(curTick());
     args.push_back(func);
     args.push_back(file);
     args.push_back(line);
     args.push_back(memUsage());
-    args.push_back(prefix);
-    args.push_back(crc);
 
     ccprintf(cerr, format.c_str(), args);
 
@@ -110,8 +103,6 @@ __base_message(std::ostream &stream, const char *prefix, bool verbose,
       default:
         format += "\n";
     }
-    
-    uint32_t crc = crc32(0, (const Bytef*)fmt, strlen(fmt));
 
     if (verbose) {
         format += " @ cycle %d\n[%s:%s, line %d]\n";
@@ -121,11 +112,5 @@ __base_message(std::ostream &stream, const char *prefix, bool verbose,
         args.push_back(line);
     }
 
-    if (strcmp(prefix, "warn") == 0) {
-        format += "For more information see: http://www.m5sim.org/%s/%x\n";
-        args.push_back(prefix);
-        args.push_back(crc);
-    }
-
     ccprintf(stream, format.c_str(), args);
 }
diff --git a/src/python/m5/util/__init__.py b/src/python/m5/util/__init__.py
index f8db6e9a7..69f153bb4 100644
--- a/src/python/m5/util/__init__.py
+++ b/src/python/m5/util/__init__.py
@@ -42,22 +42,11 @@ from smartdict import SmartDict
 from sorteddict import SortedDict
 from region import neg_inf, pos_inf, Region, Regions
 
-# define this here so we can use it right away if necessary
-def errorURL(prefix, s):
-    try:
-        import zlib
-        hashstr = "%x" % zlib.crc32(s)
-    except:
-        hashstr = "UnableToHash"
-    return "For more information see: http://www.m5sim.org/%s/%s" % \
-            (prefix, hashstr)
-
 # panic() should be called when something happens that should never
 # ever happen regardless of what the user does (i.e., an acutal m5
 # bug).
 def panic(fmt, *args):
     print >>sys.stderr, 'panic:', fmt % args
-    print >>sys.stderr, errorURL('panic',fmt)
     sys.exit(1)
 
 # fatal() should be called when the simulation cannot continue due to
@@ -65,7 +54,6 @@ def panic(fmt, *args):
 # arguments, etc.) and not a simulator bug.
 def fatal(fmt, *args):
     print >>sys.stderr, 'fatal:', fmt % args
-    print >>sys.stderr, errorURL('fatal',fmt)
     sys.exit(1)
 
 class Singleton(type):