From 77d16777c448cc4e09e0ddb1408260044f925c0b Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 10 Feb 2011 11:33:32 -0700 Subject: Patch by Armin to split apart the 'Plugin' logcontrol.xml entry to avoid spam when debugging plugins --- linden/indra/llplugin/llpluginclassmedia.cpp | 34 ++++++------ linden/indra/llplugin/llplugininstance.cpp | 24 ++++----- linden/indra/llplugin/llpluginmessagepipe.cpp | 26 ++++----- linden/indra/llplugin/llpluginprocesschild.cpp | 56 +++++++++---------- linden/indra/llplugin/llpluginprocessparent.cpp | 68 ++++++++++++------------ linden/indra/newview/app_settings/logcontrol.xml | 10 +++- linden/indra/newview/llviewermedia.cpp | 4 +- 7 files changed, 115 insertions(+), 107 deletions(-) diff --git a/linden/indra/llplugin/llpluginclassmedia.cpp b/linden/indra/llplugin/llpluginclassmedia.cpp index 85241be..5a81c46 100755 --- a/linden/indra/llplugin/llpluginclassmedia.cpp +++ b/linden/indra/llplugin/llpluginclassmedia.cpp @@ -72,10 +72,10 @@ LLPluginClassMedia::~LLPluginClassMedia() } bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug) -{ - LL_DEBUGS("Plugin") << "launcher: " << launcher_filename << LL_ENDL; - LL_DEBUGS("Plugin") << "plugin: " << plugin_filename << LL_ENDL; - +{ + LL_DEBUGS("PluginClassMedia") << "launcher: " << launcher_filename << LL_ENDL; + LL_DEBUGS("PluginClassMedia") << "plugin: " << plugin_filename << LL_ENDL; + mPlugin = new LLPluginProcessParent(this); mPlugin->setSleepTime(mSleepTime); @@ -198,7 +198,7 @@ void LLPluginClassMedia::idle(void) } else { - LL_WARNS("Plugin") << "Unable to pad texture width, padding size " << mPadding << "is not a multiple of pixel size " << mRequestedTextureDepth << LL_ENDL; + LL_WARNS("PluginClassMedia") << "Unable to pad texture width, padding size " << mPadding << "is not a multiple of pixel size " << mRequestedTextureDepth << LL_ENDL; } } } @@ -256,11 +256,11 @@ void LLPluginClassMedia::idle(void) message.setValueReal("background_b", mBackgroundColor.mV[VZ]); message.setValueReal("background_a", mBackgroundColor.mV[VW]); mPlugin->sendMessage(message); // DO NOT just use sendMessage() here -- we want this to jump ahead of the queue. - - LL_DEBUGS("Plugin") << "Sending size_change" << LL_ENDL; + + LL_DEBUGS("PluginClassMedia") << "Sending size_change" << LL_ENDL; } } - + if(mPlugin && mPlugin->isRunning()) { // Send queued messages @@ -777,7 +777,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) mDirtyRect.unionWith(newDirtyRect); } - LL_DEBUGS("Plugin") << "adjusted incoming rect is: (" + LL_DEBUGS("PluginClassMedia") << "adjusted incoming rect is: (" << newDirtyRect.mLeft << ", " << newDirtyRect.mTop << ", " << newDirtyRect.mRight << ", " @@ -841,9 +841,9 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) else if(message_name == "media_status") { std::string status = message.getValue("status"); - - LL_DEBUGS("Plugin") << "Status changed to: " << status << LL_ENDL; - + + LL_DEBUGS("PluginClassMedia") << "Status changed to: " << status << LL_ENDL; + if(status == "loading") { mStatus = LLPluginClassMediaOwner::MEDIA_LOADING; @@ -933,7 +933,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) } else { - LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; + LL_WARNS("PluginClassMedia") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; } } else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER) @@ -990,7 +990,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) } else { - LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; + LL_WARNS("PluginClassMedia") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; } } else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME) @@ -1001,9 +1001,9 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) // if(message_name == "message_name") // { // } -// else +// else { - LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; + LL_WARNS("PluginClassMedia") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; } } @@ -1230,6 +1230,6 @@ void LLPluginClassMedia::initializeUrlHistory(const LLSD& url_history) message.setValueLLSD("history", url_history); sendMessage(message); - LL_DEBUGS("Plugin") << "Sending history" << LL_ENDL; + LL_DEBUGS("PluginClassMedia") << "Sending history" << LL_ENDL; } diff --git a/linden/indra/llplugin/llplugininstance.cpp b/linden/indra/llplugin/llplugininstance.cpp index b822b9e..fd1c3c1 100755 --- a/linden/indra/llplugin/llplugininstance.cpp +++ b/linden/indra/llplugin/llplugininstance.cpp @@ -92,10 +92,10 @@ int LLPluginInstance::load(std::string &plugin_file) char buf[1024]; apr_dso_error(mDSOHandle, buf, sizeof(buf)); - LL_WARNS("Plugin") << "apr_dso_load of " << plugin_file << " failed with error " << result << " , additional info string: " << buf << LL_ENDL; - + LL_WARNS("PluginInstance") << "apr_dso_load of " << plugin_file << " failed with error " << result << " , additional info string: " << buf << LL_ENDL; + } - + if(result == APR_SUCCESS) { result = apr_dso_sym((apr_dso_handle_sym_t*)&init_function, @@ -104,20 +104,20 @@ int LLPluginInstance::load(std::string &plugin_file) if(result != APR_SUCCESS) { - LL_WARNS("Plugin") << "apr_dso_sym failed with error " << result << LL_ENDL; + LL_WARNS("PluginInstance") << "apr_dso_sym failed with error " << result << LL_ENDL; } } - + if(result == APR_SUCCESS) { result = init_function(staticReceiveMessage, (void*)this, &mPluginSendMessageFunction, &mPluginUserData); if(result != APR_SUCCESS) { - LL_WARNS("Plugin") << "call to init function failed with error " << result << LL_ENDL; + LL_WARNS("PluginInstance") << "call to init function failed with error " << result << LL_ENDL; } } - + return (int)result; } @@ -130,12 +130,12 @@ void LLPluginInstance::sendMessage(const std::string &message) { if(mPluginSendMessageFunction) { - LL_DEBUGS("Plugin") << "sending message to plugin: \"" << message << "\"" << LL_ENDL; + LL_DEBUGS("PluginInstance") << "sending message to plugin: \"" << message << "\"" << LL_ENDL; mPluginSendMessageFunction(message.c_str(), &mPluginUserData); } else { - LL_WARNS("Plugin") << "dropping message: \"" << message << "\"" << LL_ENDL; + LL_WARNS("PluginInstance") << "dropping message: \"" << message << "\"" << LL_ENDL; } } @@ -165,11 +165,11 @@ void LLPluginInstance::receiveMessage(const char *message_string) { if(mOwner) { - LL_DEBUGS("Plugin") << "processing incoming message: \"" << message_string << "\"" << LL_ENDL; + LL_DEBUGS("PluginInstance") << "processing incoming message: \"" << message_string << "\"" << LL_ENDL; mOwner->receivePluginMessage(message_string); } else { - LL_WARNS("Plugin") << "dropping incoming message: \"" << message_string << "\"" << LL_ENDL; - } + LL_WARNS("PluginInstance") << "dropping incoming message: \"" << message_string << "\"" << LL_ENDL; + } } diff --git a/linden/indra/llplugin/llpluginmessagepipe.cpp b/linden/indra/llplugin/llpluginmessagepipe.cpp index 8168b32..26cc9c0 100755 --- a/linden/indra/llplugin/llpluginmessagepipe.cpp +++ b/linden/indra/llplugin/llpluginmessagepipe.cpp @@ -82,10 +82,10 @@ bool LLPluginMessagePipeOwner::writeMessageRaw(const std::string &message) } else { - LL_WARNS("Plugin") << "dropping message: " << message << LL_ENDL; + LL_WARNS("PluginPipe") << "dropping message: " << message << LL_ENDL; result = false; } - + return result; } @@ -179,18 +179,18 @@ bool LLPluginMessagePipe::pumpOutput() { // write any outgoing messages size = (apr_size_t)mOutput.size(); - + setSocketTimeout(0); - -// LL_INFOS("Plugin") << "before apr_socket_send, size = " << size << LL_ENDL; + +// LL_INFOS("PluginPipe") << "before apr_socket_send, size = " << size << LL_ENDL; status = apr_socket_send( mSocket->getSocket(), (const char*)mOutput.data(), &size); -// LL_INFOS("Plugin") << "after apr_socket_send, size = " << size << LL_ENDL; - +// LL_INFOS("PluginPipe") << "after apr_socket_send, size = " << size << LL_ENDL; + if(status == APR_SUCCESS) { // success @@ -277,15 +277,15 @@ bool LLPluginMessagePipe::pumpInput(F64 timeout) { size = request_size; -// LL_INFOS("Plugin") << "before apr_socket_recv, size = " << size << LL_ENDL; +// LL_INFOS("PluginPipe") << "before apr_socket_recv, size = " << size << LL_ENDL; status = apr_socket_recv( - mSocket->getSocket(), - input_buf, + mSocket->getSocket(), + input_buf, &size); -// LL_INFOS("Plugin") << "after apr_socket_recv, size = " << size << LL_ENDL; - +// LL_INFOS("PluginPipe") << "after apr_socket_recv, size = " << size << LL_ENDL; + if(size > 0) { LLMutexLock lock(&mInputMutex); @@ -379,7 +379,7 @@ void LLPluginMessagePipe::processInput(void) } else { - LL_WARNS("Plugin") << "!mOwner" << LL_ENDL; + LL_WARNS("PluginPipe") << "!mOwner" << LL_ENDL; } } mInputMutex.unlock(); diff --git a/linden/indra/llplugin/llpluginprocesschild.cpp b/linden/indra/llplugin/llpluginprocesschild.cpp index 8dbf2b3..c8b97b1 100755 --- a/linden/indra/llplugin/llpluginprocesschild.cpp +++ b/linden/indra/llplugin/llpluginprocesschild.cpp @@ -94,18 +94,18 @@ void LLPluginProcessChild::idle(void) } else if(mSocketError != APR_SUCCESS) { - LL_INFOS("Plugin") << "message pipe is in error state (" << mSocketError << "), moving to STATE_ERROR"<< LL_ENDL; + LL_INFOS("PluginChild") << "message pipe is in error state (" << mSocketError << "), moving to STATE_ERROR"<< LL_ENDL; setState(STATE_ERROR); - } + } if((mState > STATE_INITIALIZED) && (mMessagePipe == NULL)) { // The pipe has been closed -- we're done. // TODO: This could be slightly more subtle, but I'm not sure it needs to be. - LL_INFOS("Plugin") << "message pipe went away, moving to STATE_ERROR"<< LL_ENDL; + LL_INFOS("PluginChild") << "message pipe went away, moving to STATE_ERROR"<< LL_ENDL; setState(STATE_ERROR); } - + // If a state needs to go directly to another state (as a performance enhancement), it can set idle_again to true after calling setState(). // USE THIS CAREFULLY, since it can starve other code. Specifically make sure there's no way to get into a closed cycle and never return. // When in doubt, don't do it. @@ -291,17 +291,17 @@ void LLPluginProcessChild::sendMessageToPlugin(const LLPluginMessage &message) if (mInstance) { std::string buffer = message.generate(); - - LL_DEBUGS("Plugin") << "Sending to plugin: " << buffer << LL_ENDL; + + LL_DEBUGS("PluginChild") << "Sending to plugin: " << buffer << LL_ENDL; LLTimer elapsed; - + mInstance->sendMessage(buffer); mCPUElapsed += elapsed.getElapsedTimeF64(); } else { - LL_WARNS("Plugin") << "mInstance == NULL" << LL_ENDL; + LL_WARNS("PluginChild") << "mInstance == NULL" << LL_ENDL; } } @@ -309,7 +309,7 @@ void LLPluginProcessChild::sendMessageToParent(const LLPluginMessage &message) { std::string buffer = message.generate(); - LL_DEBUGS("Plugin") << "Sending to parent: " << buffer << LL_ENDL; + LL_DEBUGS("PluginChild") << "Sending to parent: " << buffer << LL_ENDL; writeMessageRaw(buffer); } @@ -318,7 +318,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) { // Incoming message from the TCP Socket - LL_DEBUGS("Plugin") << "Received from parent: " << message << LL_ENDL; + LL_DEBUGS("PluginChild") << "Received from parent: " << message << LL_ENDL; // Decode this message LLPluginMessage parsed; @@ -365,7 +365,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) if(iter != mSharedMemoryRegions.end()) { // Need to remove the old region first - LL_WARNS("Plugin") << "Adding a duplicate shared memory segment!" << LL_ENDL; + LL_WARNS("PluginChild") << "Adding a duplicate shared memory segment!" << LL_ENDL; } else { @@ -392,7 +392,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) } else { - LL_WARNS("Plugin") << "Couldn't create a shared memory segment!" << LL_ENDL; + LL_WARNS("PluginChild") << "Couldn't create a shared memory segment!" << LL_ENDL; delete region; } } @@ -411,7 +411,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) } else { - LL_WARNS("Plugin") << "shm_remove for unknown memory segment!" << LL_ENDL; + LL_WARNS("PluginChild") << "shm_remove for unknown memory segment!" << LL_ENDL; } } else if(message_name == "sleep_time") @@ -421,12 +421,12 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) else if(message_name == "crash") { // Crash the plugin - LL_ERRS("Plugin") << "Plugin crash requested." << LL_ENDL; + LL_ERRS("PluginChild") << "Plugin crash requested." << LL_ENDL; } else if(message_name == "hang") { // Hang the plugin - LL_WARNS("Plugin") << "Plugin hang requested." << LL_ENDL; + LL_WARNS("PluginChild") << "Plugin hang requested." << LL_ENDL; while(1) { // wheeeeeeeee...... @@ -434,7 +434,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) } else { - LL_WARNS("Plugin") << "Unknown internal message from parent: " << message_name << LL_ENDL; + LL_WARNS("PluginChild") << "Unknown internal message from parent: " << message_name << LL_ENDL; } } } @@ -449,17 +449,17 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) } } -/* virtual */ +/* virtual */ void LLPluginProcessChild::receivePluginMessage(const std::string &message) { - LL_DEBUGS("Plugin") << "Received from plugin: " << message << LL_ENDL; - + LL_DEBUGS("PluginChild") << "Received from plugin: " << message << LL_ENDL; + if(mBlockingRequest) { - // - LL_ERRS("Plugin") << "Can't send a message while already waiting on a blocking request -- aborting!" << LL_ENDL; + // + LL_ERRS("PluginChild") << "Can't send a message while already waiting on a blocking request -- aborting!" << LL_ENDL; } - + // Incoming message from the plugin instance bool passMessage = true; @@ -523,18 +523,18 @@ void LLPluginProcessChild::receivePluginMessage(const std::string &message) } else { - LL_WARNS("Plugin") << "shm_remove_response for unknown memory segment!" << LL_ENDL; + LL_WARNS("PluginChild") << "shm_remove_response for unknown memory segment!" << LL_ENDL; } } } } - + if(passMessage) { - LL_DEBUGS("Plugin") << "Passing through to parent: " << message << LL_ENDL; + LL_DEBUGS("PluginChild") << "Passing through to parent: " << message << LL_ENDL; writeMessageRaw(message); } - + while(mBlockingRequest) { // The plugin wants to block and wait for a response to this message. @@ -552,8 +552,8 @@ void LLPluginProcessChild::receivePluginMessage(const std::string &message) void LLPluginProcessChild::setState(EState state) { - LL_DEBUGS("Plugin") << "setting state to " << state << LL_ENDL; - mState = state; + LL_DEBUGS("PluginChild") << "setting state to " << state << LL_ENDL; + mState = state; }; void LLPluginProcessChild::deliverQueuedMessages() diff --git a/linden/indra/llplugin/llpluginprocessparent.cpp b/linden/indra/llplugin/llpluginprocessparent.cpp index 8fd18ef..ecb2262 100755 --- a/linden/indra/llplugin/llpluginprocessparent.cpp +++ b/linden/indra/llplugin/llpluginprocessparent.cpp @@ -119,7 +119,7 @@ LLPluginProcessParent::LLPluginProcessParent(LLPluginProcessParentOwner *owner): LLPluginProcessParent::~LLPluginProcessParent() { - LL_DEBUGS("Plugin") << "destructor" << LL_ENDL; + LL_DEBUGS("PluginParent") << "destructor" << LL_ENDL; // Remove from the global list before beginning destruction. { @@ -264,10 +264,10 @@ void LLPluginProcessParent::idle(void) else if(mSocketError != APR_SUCCESS) { // The socket is in an error state -- the plugin is gone. - LL_WARNS("Plugin") << "Socket hit an error state (" << mSocketError << ")" << LL_ENDL; + LL_WARNS("PluginParent") << "Socket hit an error state (" << mSocketError << ")" << LL_ENDL; errorState(); } - } + } // If a state needs to go directly to another state (as a performance enhancement), it can set idle_again to true after calling setState(). // USE THIS CAREFULLY, since it can starve other code. Specifically make sure there's no way to get into a closed cycle and never return. @@ -327,15 +327,15 @@ void LLPluginProcessParent::idle(void) if(mBoundPort == 0) { - LL_WARNS("Plugin") << "Bound port number unknown, bailing out." << LL_ENDL; - + LL_WARNS("PluginParent") << "Bound port number unknown, bailing out." << LL_ENDL; + killSockets(); errorState(); break; } } - - LL_DEBUGS("Plugin") << "Bound tcp socket to port: " << addr->port << LL_ENDL; + + LL_DEBUGS("PluginParent") << "Bound tcp socket to port: " << addr->port << LL_ENDL; // Make the listen socket non-blocking status = apr_socket_opt_set(mListenSocket->getSocket(), APR_SO_NONBLOCK, 1); @@ -458,8 +458,8 @@ void LLPluginProcessParent::idle(void) break; case STATE_HELLO: - LL_DEBUGS("Plugin") << "received hello message" << LL_ENDL; - + LL_DEBUGS("PluginParent") << "received hello message" << LL_ENDL; + // Send the message to load the plugin { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "load_plugin"); @@ -492,7 +492,7 @@ void LLPluginProcessParent::idle(void) } else if(pluginLockedUp()) { - LL_WARNS("Plugin") << "timeout in exiting state, bailing out" << LL_ENDL; + LL_WARNS("PluginParent") << "timeout in exiting state, bailing out" << LL_ENDL; errorState(); } break; @@ -589,11 +589,11 @@ void LLPluginProcessParent::sendMessage(const LLPluginMessage &message) // reset the heartbeat timer, since there will have been no heartbeats while the plugin was blocked. mHeartbeat.setTimerExpirySec(mPluginLockupTimeout); } - + std::string buffer = message.generate(); - LL_DEBUGS("Plugin") << "Sending: " << buffer << LL_ENDL; + LL_DEBUGS("PluginParent") << "Sending: " << buffer << LL_ENDL; writeMessageRaw(buffer); - + // Try to send message immediately. if(mMessagePipe) { @@ -851,8 +851,8 @@ void LLPluginProcessParent::servicePoll() void LLPluginProcessParent::receiveMessageRaw(const std::string &message) { - LL_DEBUGS("Plugin") << "Received: " << message << LL_ENDL; - + LL_DEBUGS("PluginParent") << "Received: " << message << LL_ENDL; + LLPluginMessage parsed; if(parsed.parse(message) != -1) { @@ -918,19 +918,19 @@ void LLPluginProcessParent::receiveMessage(const LLPluginMessage &message) } else { - LL_WARNS("Plugin") << "received hello message in wrong state -- bailing out" << LL_ENDL; + LL_WARNS("PluginParent") << "received hello message in wrong state -- bailing out" << LL_ENDL; errorState(); } - + } else if(message_name == "load_plugin_response") { if(mState == STATE_LOADING) { - // Plugin has been loaded. - + // Plugin has been loaded. + mPluginVersionString = message.getValue("plugin_version"); - LL_INFOS("Plugin") << "plugin version string: " << mPluginVersionString << LL_ENDL; + LL_INFOS("PluginParent") << "plugin version string: " << mPluginVersionString << LL_ENDL; // Check which message classes/versions the plugin supports. // TODO: check against current versions @@ -939,9 +939,9 @@ void LLPluginProcessParent::receiveMessage(const LLPluginMessage &message) LLSD::map_iterator iter; for(iter = mMessageClassVersions.beginMap(); iter != mMessageClassVersions.endMap(); iter++) { - LL_INFOS("Plugin") << "message class: " << iter->first << " -> version: " << iter->second.asString() << LL_ENDL; + LL_INFOS("PluginParent") << "message class: " << iter->first << " -> version: " << iter->second.asString() << LL_ENDL; } - + // Send initial sleep time setSleepTime(mSleepTime, true); @@ -949,7 +949,7 @@ void LLPluginProcessParent::receiveMessage(const LLPluginMessage &message) } else { - LL_WARNS("Plugin") << "received load_plugin_response message in wrong state -- bailing out" << LL_ENDL; + LL_WARNS("PluginParent") << "received load_plugin_response message in wrong state -- bailing out" << LL_ENDL; errorState(); } } @@ -960,8 +960,8 @@ void LLPluginProcessParent::receiveMessage(const LLPluginMessage &message) mCPUUsage = message.getValueReal("cpu_usage"); - LL_DEBUGS("Plugin") << "cpu usage reported as " << mCPUUsage << LL_ENDL; - + LL_DEBUGS("PluginSpam") << "cpu usage reported as " << mCPUUsage << LL_ENDL; + } else if(message_name == "shm_add_response") { @@ -983,7 +983,7 @@ void LLPluginProcessParent::receiveMessage(const LLPluginMessage &message) } else { - LL_WARNS("Plugin") << "Unknown internal message from child: " << message_name << LL_ENDL; + LL_WARNS("PluginParent") << "Unknown internal message from child: " << message_name << LL_ENDL; } } else @@ -1015,7 +1015,7 @@ std::string LLPluginProcessParent::addSharedMemory(size_t size) } else { - LL_WARNS("Plugin") << "Couldn't create a shared memory segment!" << LL_ENDL; + LL_WARNS("PluginParent") << "Couldn't create a shared memory segment!" << LL_ENDL; // Don't leak delete region; @@ -1037,7 +1037,7 @@ void LLPluginProcessParent::removeSharedMemory(const std::string &name) } else { - LL_WARNS("Plugin") << "Request to remove an unknown shared memory segment." << LL_ENDL; + LL_WARNS("PluginParent") << "Request to remove an unknown shared memory segment." << LL_ENDL; } } size_t LLPluginProcessParent::getSharedMemorySize(const std::string &name) @@ -1084,25 +1084,25 @@ std::string LLPluginProcessParent::getPluginVersion(void) void LLPluginProcessParent::setState(EState state) { - LL_DEBUGS("Plugin") << "setting state to " << stateToString(state) << LL_ENDL; - mState = state; + LL_DEBUGS("PluginParent") << "setting state to " << stateToString(state) << LL_ENDL; + mState = state; }; bool LLPluginProcessParent::pluginLockedUpOrQuit() { bool result = false; - + if(!mProcess.isRunning()) { - LL_WARNS("Plugin") << "child exited" << LL_ENDL; + LL_WARNS("PluginParent") << "child exited" << LL_ENDL; result = true; } else if(pluginLockedUp()) { - LL_WARNS("Plugin") << "timeout" << LL_ENDL; + LL_WARNS("PluginParent") << "timeout" << LL_ENDL; result = true; } - + return result; } diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml index c94fc51..cdc837d 100644 --- a/linden/indra/newview/app_settings/logcontrol.xml +++ b/linden/indra/newview/app_settings/logcontrol.xml @@ -66,7 +66,15 @@ - + Plugin + PluginClassMedia + PluginInstance + PluginPipe + PluginChild + + PluginParent + PluginViewerMedia + diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp index 5c01b25..f0faedf 100644 --- a/linden/indra/newview/llviewermedia.cpp +++ b/linden/indra/newview/llviewermedia.cpp @@ -402,7 +402,7 @@ bool LLViewerMediaImpl::initializeMedia(const std::string& mime_type) { if(! initializePlugin(mime_type)) { - LL_WARNS("Plugin") << "plugin intialization failed for mime type: " << mime_type << LL_ENDL; + LL_WARNS("PluginViewerMedia") << "plugin intialization failed for mime type: " << mime_type << LL_ENDL; LLSD args; args["MIME_TYPE"] = mime_type; LLNotifications::instance().add("NoPlugin", args); @@ -520,7 +520,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ } } - LL_WARNS("Plugin") << "plugin intialization failed for mime type: " << media_type << LL_ENDL; + LL_WARNS("PluginViewerMedia") << "plugin intialization failed for mime type: " << media_type << LL_ENDL; LLSD args; args["MIME_TYPE"] = media_type; LLNotifications::instance().add("NoPlugin", args); -- cgit v1.1