Changeset 1699

Timestamp:

06/30/10 18:32:04 (14 years ago)

Author:

sean

Message:

Fixed receiveTimeout.

Files:

• trunk/phobos/std/concurrency.d (modified) (2 diffs)

trunk/phobos/std/concurrency.d

@@ -583 +583 @@
-            }
-        }
-        
-        
-        /*
-         * Matches ops against each message in turn until a match is found.
-         *
-         * Params:
-         *  ops = The operations to match.  Each may return a bool to indicate
-         *        whether a message with a matching type is truly a match.
+         *
+         * Returns:
+         *  true if a message was retrieved and false if not (such as if a
+         *  timeout occurred).
-         * 
-         * Throws:
-         *  LinkTerminated if a linked thread terminated, or OwnerTerminated
-         * if the owner thread terminates and no existing messages match the
-         * supplied ops.
-         */
-void
+bool
-        {
-            static assert( T.length );
-
-            static if( isImplicitlyConvertible!(T[0], long) )
-            {
-                alias TypeTuple!(T[1 .. $]) Ops;
-                alias vals[1 .. $] ops;
-                assert( vals[0] >= 0 );
-                enum timedWait = true;
-                long period = vals[0];
@@ -761 +765 @@
-                return false;
-            }
-            
-            while( true )
-            {
-                ListT arrived;
-
-                if( pty( m_localPty ) ||
-                    scan( m_localBox ) )
-                {
-
+ true
-                }
-                synchronized( m_lock )
-                {
-                    updateMsgCount();
-                    while( m_sharedPty.empty && m_sharedBox.empty )
-                    {
-                        if( ownerDead )
-                            onOwnerDead();
-                        // NOTE: We're notifying all waiters here instead of just
-                        //       a few because the onCrowding behavior may have
-                        //       changed and we don't want to block sender threads
-                        //       unnecessarily if the new behavior is not to block.
-                        //       This will admittedly result in spurious wakeups
-                        //       in other situations, but what can you do?
-                        if( m_putQueue && !mboxFull() )
-                            m_notFull.notifyAll();
-                        static if( timedWait )
-
+
+
+
+
-                        else
+                        {
-                            m_putMsg.wait();
+                        }
-                    }
-                    m_localPty.put( m_sharedPty );
-                    arrived.put( m_sharedBox );
-                }
-                if( m_localPty.empty )
-                {
-                    bool ok = scan( arrived );
-                    m_localBox.put( arrived );
-
+ true
-                    else continue;
-                }
-                m_localBox.put( arrived );
-                pty( m_localPty );
-
+ true
-            }
-        }
-        
-        
-        /*
-         * Called on thread termination.  This routine processes any remaining
-         * control messages, clears out message queues, and sets a flag to
-         * reject any future messages.
-         */
-        final void close()