Changeset 376

Timestamp:

06/08/07 10:45:23 (2 years ago)

Author:

blackhedd

Message:

refactored the "close descriptor" mechanism, preparatory to making epoll-related changes.

Files:

• version_0/ext/ed.cpp (modified) (9 diffs)
• version_0/ext/ed.h (modified) (3 diffs)
• version_0/ext/pipe.cpp (modified) (3 diffs)

version_0/ext/ed.cpp

@@ -45 +45 @@
-
-EventableDescriptor::EventableDescriptor (int sd, EventMachine_t *em):
+        bCloseNow (false),
+        bCloseAfterWriting (false),
-        EventCallback (NULL),
-        LastRead (0),
-        LastWritten (0),
-        MySocket (sd),
-        bCloseNow (false),
-        bCloseAfterWriting (false),
-        bCallbackUnbind (true),
-        MyEventMachine (em)
@@ -149 +149 @@
-void EventableDescriptor::ScheduleClose (bool after_writing)
-{
+        // KEEP THIS SYNCHRONIZED WITH ::IsCloseScheduled.
-        if (after_writing)
-                bCloseAfterWriting = true;
-        else
-                bCloseNow = true;
+}
+
+
+/*************************************
+EventableDescriptor::IsCloseScheduled
+*************************************/
+
+bool EventableDescriptor::IsCloseScheduled()
+{
+        // KEEP THIS SYNCHRONIZED WITH ::ScheduleClose.
+        return (bCloseNow || bCloseAfterWriting);
-}
-
@@ -274 +286 @@
-        // (Well, not so bad, small pages are coalesced in ::Write)
-
-
+
+
-                return 0;
-
@@ -421 +434 @@
-                // If we read no data on a socket that selected readable,
-                // it generally means the other end closed the connection gracefully.
-
+
+
-        }
-
@@ -502 +516 @@
-                }
-                else
-
+
+
-        }
-        else {
@@ -685 +700 @@
-        if (bConnectPending) {
-                if ((gCurrentLoopTime - CreatedAt) >= PendingConnectTimeout)
-
+
+
-        }
-        else {
-                if (InactivityTimeout && ((gCurrentLoopTime - LastIo) >= InactivityTimeout))
-
+
+
-        }
-}
@@ -888 +905 @@
-        // Close it if its inactivity timer has expired.
-
-
-
+
+
+
-}
-
@@ -1038 +1056 @@
-        // That means it needs to move to a common ancestor.
-
-
+
+
-                return 0;
-
@@ -1069 +1088 @@
-        // TODO: Refactor this so there's no overlap with SendOutboundData.
-
-
+
+
-                return 0;
-

version_0/ext/ed.h

@@ -58 +58 @@
-
-                void ScheduleClose (bool after_writing);
+                bool IsCloseScheduled();
-
-                void SetEventCallback (void (*cb)(const char*, int, const char*, int));
@@ -73 +74 @@
-                struct epoll_event *GetEpollEvent() { return &EpollEvent; }
-                #endif
+
+        private:
+                bool bCloseNow;
+                bool bCloseAfterWriting;
-
-        protected:
@@ -85 +90 @@
-                time_t LastWritten;
-                int MySocket;
-                bool bCloseNow;
-                bool bCloseAfterWriting;
-                bool bCallbackUnbind;
-

version_0/ext/pipe.cpp

@@ -133 +133 @@
-                // If we read no data on a socket that selected readable,
-                // it generally means the other end closed the connection gracefully.
-
+
+
-        }
-
@@ -208 +209 @@
-        // If an inactivity timeout is defined, then check for it.
-        if (InactivityTimeout && ((gCurrentLoopTime - LastIo) >= InactivityTimeout))
-
+
+
-}
-
@@ -247 +249 @@
-int PipeDescriptor::SendOutboundData (const char *data, int length)
-{
-
+
+
-                return 0;
-