android: re-factor headless a little, and start on the mainloop

1 files changed, 26 insertions, 19 deletions

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 9de3f8259968..56ea818af6bc 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -325,25 +325,32 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
         else
             nTimeoutMS = -1; // wait until something happens
 
-        // release yield mutex
-        nAcquireCount = ReleaseYieldMutex();
-        // poll
-        struct pollfd aPoll;
-        aPoll.fd = m_pTimeoutFDS[0];
-        aPoll.events = POLLIN;
-        aPoll.revents = 0;
-        poll( &aPoll, 1, nTimeoutMS );
-
-        // acquire yield mutex again
-        AcquireYieldMutex( nAcquireCount );
-
-        // clean up pipe
-        if( (aPoll.revents & POLLIN) != 0 )
-        {
-            int buffer;
-            while (read (m_pTimeoutFDS[0], &buffer, sizeof(buffer)) > 0)
-                continue;
-        }
+        DoReleaseYield(nTimeoutMS);
+    }
+}
+
+void SvpSalInstance::DoReleaseYield( int nTimeoutMS )
+{
+    // poll
+    struct pollfd aPoll;
+    aPoll.fd = m_pTimeoutFDS[0];
+    aPoll.events = POLLIN;
+    aPoll.revents = 0;
+
+    // release yield mutex
+    sal_uLong nAcquireCount = ReleaseYieldMutex();
+
+    poll( &aPoll, 1, nTimeoutMS );
+
+    // acquire yield mutex again
+    AcquireYieldMutex( nAcquireCount );
+
+    // clean up pipe
+    if( (aPoll.revents & POLLIN) != 0 )
+    {
+        int buffer;
+        while (read (m_pTimeoutFDS[0], &buffer, sizeof(buffer)) > 0)
+            continue;
     }
 }