Changeset 22:d13fbc745959 in xplcommon for src/xplcommon/win32/Completer.h

Timestamp:

01/02/13 06:43:16 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Cleaned up and simplified the code

File:

• src/xplcommon/win32/Completer.h (modified) (5 diffs)

src/xplcommon/win32/Completer.h

@@ -51 +51 @@
 protected:
     /**
+     * The overlappable object this completer belongs to.
+     */
+    Overlappable& overlappable;
+
+    /**
      * The overlapped object.
      */
@@ -64 +69 @@
      * Destroy the completer.
      */
-    ~Completer();
+    virtual ~Completer();
 
     /**
@@ -88 +93 @@
      * @see Overlapped::getResult
      */
-    bool getResult(DWORD& size, HANDLE file);
+    bool getResult(DWORD& size);
+
+    /**
+     * Check whether we are waiting for an overlapped result and if
+     * so, return that.
+     *
+     * @param result will contain the result to return if we are
+     * waiting for an overlapped result.
+     *
+     * @return whether we are waiting for an overlapped result
+     */
+    bool checkWaitedResult(bool& result);
+
+    /**
+     * Handle the given result coming from an overlapped object.
+     */
+    virtual void handleWaitedResult(DWORD size) = 0;
 };
 
@@ -96 +117 @@
 
 inline Completer::Completer(Overlappable* overlappable) :
+    overlappable(*overlappable),
     overlapped((overlappable->waiter==0) ? 0 : new Overlapped(*overlappable))
 {
@@ -130 +152 @@
 //------------------------------------------------------------------------------
 
-inline bool Completer::getResult(DWORD& size, HANDLE file)
+inline bool Completer::getResult(DWORD& size)
 {
-    return overlapped!=0 && overlapped->getResult(size, file);
+    return overlapped!=0 && overlapped->getResult(size, overlappable.handle);
+}
+
+//------------------------------------------------------------------------------
+
+inline bool Completer::checkWaitedResult(bool& result)
+{
+    if (!isWaited()) {
+        return false;
+    }
+
+    DWORD size = 0;
+    result = getResult(size);
+
+    if (result) {
+        removeFromWaiter();
+        handleWaitedResult(size);
+    } else if (overlappable.failed()) {
+        removeFromWaiter();
+    }
+
+    return true;
 }