diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-06-01 19:36:38 -0700 | 
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-01 19:36:38 -0700 | 
| commit | cf3d2a06a13528cca1327becfb9e8dcb5ff4614a (patch) | |
| tree | a58c89cfe474308985b07b3e86f991b886a86114 /indra/llcommon | |
| parent | e331566dba65b8aa33fceb6d1cec8bf0550bbd7d (diff) | |
BUG-2707 turn off more LL_DEBUGS to narrow down Kat's crashing cuplrit
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/llavatarname.cpp | 10 | ||||
| -rwxr-xr-x | indra/llcommon/lleventcoro.h | 34 | ||||
| -rwxr-xr-x | indra/llcommon/llprocess.cpp | 23 | 
3 files changed, 33 insertions, 34 deletions
| diff --git a/indra/llcommon/llavatarname.cpp b/indra/llcommon/llavatarname.cpp index 642bd82e90..aaa7f1212f 100755 --- a/indra/llcommon/llavatarname.cpp +++ b/indra/llcommon/llavatarname.cpp @@ -230,10 +230,10 @@ std::string LLAvatarName::getUserName() const  void LLAvatarName::dump() const  { -	LL_DEBUGS("AvNameCache") << "LLAvatarName: " -	                         << "user '" << mUsername << "' " -							 << "display '" << mDisplayName << "' " -	                         << "expires in " << mExpires - LLFrameTimer::getTotalSeconds() << " seconds" -							 << LL_ENDL; +	//LL_DEBUGS("AvNameCache") << "LLAvatarName: " +	//                         << "user '" << mUsername << "' " +	//						 << "display '" << mDisplayName << "' " +	//                         << "expires in " << mExpires - LLFrameTimer::getTotalSeconds() << " seconds" +	//						 << LL_ENDL;  } diff --git a/indra/llcommon/lleventcoro.h b/indra/llcommon/lleventcoro.h index a42af63b65..f25c313920 100755 --- a/indra/llcommon/lleventcoro.h +++ b/indra/llcommon/lleventcoro.h @@ -220,21 +220,21 @@ LLSD postAndWait(SELF& self, const LLSD& event, const LLEventPumpOrPumpName& req          // request event.          LLSD modevent(event);          LLEventDetail::storeToLLSDPath(modevent, replyPumpNamePath, replyPump.getPump().getName()); -		LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName -                                 << " posting to " << requestPump.getPump().getName() -								 << LL_ENDL; +		//LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName +      //                           << " posting to " << requestPump.getPump().getName() +		//						 << LL_ENDL;  		// *NOTE:Mani - Removed because modevent could contain user's hashed passwd.  		//                         << ": " << modevent << LL_ENDL;          requestPump.getPump().post(modevent);      } -    LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName -                             << " about to wait on LLEventPump " << replyPump.getPump().getName() -                             << LL_ENDL; +    //LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName +    //                         << " about to wait on LLEventPump " << replyPump.getPump().getName() +    //                         << LL_ENDL;      // trying to dereference ("resolve") the future makes us wait for it      LLSD value(*future); -    LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName -                             << " resuming with " << value << LL_ENDL; +    //LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName +    //                         << " resuming with " << value << LL_ENDL;      // returning should disconnect the connection      return value;  } @@ -351,19 +351,19 @@ LLEventWithID postAndWait2(SELF& self, const LLSD& event,                                         replyPump0.getPump().getName());          LLEventDetail::storeToLLSDPath(modevent, replyPump1NamePath,                                         replyPump1.getPump().getName()); -        LL_DEBUGS("lleventcoro") << "postAndWait2(): coroutine " << name -                                 << " posting to " << requestPump.getPump().getName() -                                 << ": " << modevent << LL_ENDL; +        //LL_DEBUGS("lleventcoro") << "postAndWait2(): coroutine " << name +        //                         << " posting to " << requestPump.getPump().getName() +        //                         << ": " << modevent << LL_ENDL;          requestPump.getPump().post(modevent);      } -    LL_DEBUGS("lleventcoro") << "postAndWait2(): coroutine " << name -                             << " about to wait on LLEventPumps " << replyPump0.getPump().getName() -                             << ", " << replyPump1.getPump().getName() << LL_ENDL; +    //LL_DEBUGS("lleventcoro") << "postAndWait2(): coroutine " << name +    //                         << " about to wait on LLEventPumps " << replyPump0.getPump().getName() +    //                         << ", " << replyPump1.getPump().getName() << LL_ENDL;      // trying to dereference ("resolve") the future makes us wait for it      LLEventWithID value(*future); -    LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << name -                             << " resuming with (" << value.first << ", " << value.second << ")" -                             << LL_ENDL; +    //LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << name +    //                        << " resuming with (" << value.first << ", " << value.second << ")" +    //                         << LL_ENDL;      // returning should disconnect both connections      return value;  } diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp index 715df36f39..59298366a3 100755 --- a/indra/llcommon/llprocess.cpp +++ b/indra/llcommon/llprocess.cpp @@ -81,7 +81,7 @@ public:  		// incrementing, listen on "mainloop".  		if (mCount++ == 0)  		{ -			LL_DEBUGS("LLProcess") << "listening on \"mainloop\"" << LL_ENDL; +			//LL_DEBUGS("LLProcess") << "listening on \"mainloop\"" << LL_ENDL;  			mConnection = LLEventPumps::instance().obtain("mainloop")  				.listen("LLProcessListener", boost::bind(&LLProcessListener::tick, this, _1));  		} @@ -93,7 +93,7 @@ public:  		// stop listening on "mainloop".  		if (--mCount == 0)  		{ -			LL_DEBUGS("LLProcess") << "disconnecting from \"mainloop\"" << LL_ENDL; +			//LL_DEBUGS("LLProcess") << "disconnecting from \"mainloop\"" << LL_ENDL;  			mConnection.disconnect();  		}  	} @@ -118,7 +118,7 @@ private:  		// centralize such calls, using "mainloop" to ensure it happens once  		// per frame, and refcounting running LLProcess objects to remain  		// registered only while needed. -		LL_DEBUGS("LLProcess") << "calling apr_proc_other_child_refresh_all()" << LL_ENDL; +		//LL_DEBUGS("LLProcess") << "calling apr_proc_other_child_refresh_all()" << LL_ENDL;  		apr_proc_other_child_refresh_all(APR_OC_REASON_RUNNING);  		return false;  	} @@ -216,13 +216,13 @@ public:  					remainptr += written;  					remainlen -= written; -					char msgbuf[512]; -					LL_DEBUGS("LLProcess") << "wrote " << written << " of " << towrite -										   << " bytes to " << mDesc -										   << " (original " << total << ")," -										   << " code " << err << ": " -										   << apr_strerror(err, msgbuf, sizeof(msgbuf)) -										   << LL_ENDL; +					//char msgbuf[512]; +					//LL_DEBUGS("LLProcess") << "wrote " << written << " of " << towrite +					//					   << " bytes to " << mDesc +					//					   << " (original " << total << ")," +					//					   << " code " << err << ": " +					//					   << apr_strerror(err, msgbuf, sizeof(msgbuf)) +					//					   << LL_ENDL;  					// The parent end of this pipe is nonblocking. If we weren't able  					// to write everything we wanted, don't keep banging on it -- that @@ -738,8 +738,7 @@ LLProcess::LLProcess(const LLSDOrParams& params):  		{  			mPipes.replace(i, new ReadPipeImpl(desc, pipe, FILESLOT(i)));  		} -		LL_DEBUGS("LLProcess") << "Instantiating " << typeid(mPipes[i]).name() -							   << "('" << desc << "')" << LL_ENDL; +		LL_DEBUGS("LLProcess") << "Instantiating " << typeid(mPipes[i]).name() << "('" << desc << "')" << LL_ENDL;  	}  } | 
