From a442646791730201c978f586265e411f776b27c8 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Fri, 2 Jun 2006 02:22:11 +0000 Subject: [PATCH] Supress extra debuggy logging. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4169 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/as/com/threerings/io/FrameReader.as | 9 +++++++-- src/as/com/threerings/io/ObjectInputStream.as | 11 ++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/as/com/threerings/io/FrameReader.as b/src/as/com/threerings/io/FrameReader.as index 6a7e0fd15..bf8cfd454 100644 --- a/src/as/com/threerings/io/FrameReader.as +++ b/src/as/com/threerings/io/FrameReader.as @@ -26,7 +26,10 @@ public class FrameReader extends EventDispatcher */ protected function socketHasData (event :ProgressEvent) :void { - Log.getLog(this).debug("socketHasData(" + _socket.bytesAvailable + ")"); + if (ObjectInputStream.DEBUG) { + Log.getLog(this).debug( + "socketHasData(" + _socket.bytesAvailable + ")"); + } if (_curData == null) { if (_socket.bytesAvailable < HEADER_SIZE) { // if there are less bytes available than a header, let's @@ -52,7 +55,9 @@ public class FrameReader extends EventDispatcher if (_length === _curData.length) { // we have now read a complete frame, let us dispatch the data _curData.position = 0; // move the read pointer to the beginning - Log.getLog(this).debug("+ FrameAvailable"); + if (ObjectInputStream.DEBUG) { + Log.getLog(this).debug("+ FrameAvailable"); + } dispatchEvent(new FrameAvailableEvent(_curData)); _curData = null; // clear, so we know we need to first read length diff --git a/src/as/com/threerings/io/ObjectInputStream.as b/src/as/com/threerings/io/ObjectInputStream.as index eff03df11..7b2d994c6 100644 --- a/src/as/com/threerings/io/ObjectInputStream.as +++ b/src/as/com/threerings/io/ObjectInputStream.as @@ -37,7 +37,7 @@ public class ObjectInputStream // a zero code indicates a null value if (code == 0) { - log.debug(DEBUG_ID + "Read null"); + if (DEBUG) log.debug(DEBUG_ID + "Read null"); return null; } @@ -61,11 +61,12 @@ public class ObjectInputStream cmap = new ClassMapping(code, cname, streamer); _classMap[code] = cmap; - log.debug(DEBUG_ID + + if (DEBUG) log.debug(DEBUG_ID + "Created mapping: (" + code + "): " + cname); } else { - log.debug(DEBUG_ID + "Read known code: (" + code + ")"); + if (DEBUG) log.debug( + DEBUG_ID + "Read known code: (" + code + ")"); cmap = (_classMap[code] as ClassMapping); if (null == cmap) { throw new IOError("Read object for which we have no " + @@ -84,7 +85,7 @@ public class ObjectInputStream } //log.debug("Reading object..."); readBareObjectImpl(target, cmap.streamer); - log.debug(DEBUG_ID + "Read object: " + target); + if (DEBUG) log.debug(DEBUG_ID + "Read object: " + target); return target; } catch (me :MemoryError) { @@ -233,7 +234,7 @@ public class ObjectInputStream protected var _classMap :Array = new Array(); - + public static const DEBUG :Boolean = false; private static var _tempy :int = 0; } }