1 files changed, 30 insertions, 2 deletions

diff --git a/linden/indra/llplugin/llpluginprocessparent.h b/linden/indra/llplugin/llpluginprocessparent.h
index 523ce51..a8929b1 100755
--- a/linden/indra/llplugin/llpluginprocessparent.h
+++ b/linden/indra/llplugin/llpluginprocessparent.h
@@ -36,6 +36,8 @@
 #ifndef LL_LLPLUGINPROCESSPARENT_H
 #define LL_LLPLUGINPROCESSPARENT_H
 
+#include <queue> //imprudence
+
 #include "llapr.h"
 #include "llprocesslauncher.h"
 #include "llpluginmessage.h"
@@ -43,12 +45,14 @@
 #include "llpluginsharedmemory.h"
 
 #include "lliosocket.h"
+#include "llthread.h"
 
 class LLPluginProcessParentOwner
 {
 public:
         virtual ~LLPluginProcessParentOwner();
         virtual void receivePluginMessage(const LLPluginMessage &message) = 0;
+        virtual bool receivePluginMessageEarly(const LLPluginMessage &message) {return false;};
         // This will only be called when the plugin has died unexpectedly 
         virtual void pluginLaunchFailed() {};
         virtual void pluginDied() {};
@@ -76,6 +80,9 @@ public:
         // returns true if the process has exited or we've had a fatal error
         bool isDone(void);      
         
+        // returns true if the process is currently waiting on a blocking request
+        bool isBlocked(void) { return mBlocked; };
+        
         void killSockets(void);
         
         // Go to the proper error state
@@ -89,7 +96,9 @@ public:
         void receiveMessage(const LLPluginMessage &message);
         
         // Inherited from LLPluginMessagePipeOwner
-        void receiveMessageRaw(const std::string &message);
+        /*virtual*/ void receiveMessageRaw(const std::string &message);
+        /*virtual*/ void receiveMessageEarly(const LLPluginMessage &message);
+        /*virtual*/ void setMessagePipe(LLPluginMessagePipe *message_pipe) ;
         
         // This adds a memory segment shared with the client, generating a name for the segment.  The name generated is guaranteed to be unique on the host.
         // The caller must call removeSharedMemory first (and wait until getSharedMemorySize returns 0 for the indicated name) before re-adding a segment with the same name.
@@ -112,7 +121,11 @@ public:
         void setLockupTimeout(F32 timeout) { mPluginLockupTimeout = timeout; };
 
         F64 getCPUUsage() { return mCPUUsage; };
-
+        
+        static void poll(F64 timeout);
+        static bool canPollThreadRun() { return (sPollSet || sPollsetNeedsRebuild || sUseReadThread); };
+        static void setUseReadThread(bool use_read_thread);
+        static bool getUseReadThread() { return sUseReadThread; };
 private:
 
         enum EState
@@ -162,12 +175,27 @@ private:
         
         bool mDisableTimeout;
         bool mDebug;
+        bool mBlocked;
+        bool mPolledInput;
 
         LLProcessLauncher mDebugger;
         
         F32 mPluginLaunchTimeout;               // Somewhat longer timeout for initial launch.
         F32 mPluginLockupTimeout;               // If we don't receive a heartbeat in this many seconds, we declare the plugin locked up.
 
+        static bool sUseReadThread;
+        apr_pollfd_t mPollFD;
+        static apr_pollset_t *sPollSet;
+        static bool sPollsetNeedsRebuild;
+        static LLMutex *sInstancesMutex;
+        static std::list<LLPluginProcessParent*> sInstances;
+        static void dirtyPollSet();
+        static void updatePollset();
+        void servicePoll();
+        static LLThread *sReadThread;
+        
+        LLMutex mIncomingQueueMutex;
+        std::queue<LLPluginMessage> mIncomingQueue;
 };
 
 #endif // LL_LLPLUGINPROCESSPARENT_H