X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fsystem%2FSharedArbiterP.nc;h=094dbc1b7ead6bf56840b2d5fd5573adce4264d6;hb=be862ab07d080085823951d18dcb27a28a310ace;hp=40afb970ed91b670578ba4091ac385d323eb3115;hpb=63b3ea113fdeca4b51bf68fec23354e6a78fafae;p=tinyos-2.x.git

diff --git a/tos/system/SharedArbiterP.nc b/tos/system/SharedArbiterP.nc
index 40afb970..094dbc1b 100644
--- a/tos/system/SharedArbiterP.nc
+++ b/tos/system/SharedArbiterP.nc
@@ -10,7 +10,7 @@
  * - Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * - Neither the name of the Technische Universität Berlin nor the names
+ * - Neither the name of the Titanium Mirror, Inc. nor the names
  *   of its contributors may be used to endorse or promote products derived
  *   from this software without specific prior written permission.
  *
@@ -52,6 +52,7 @@ implementation {
   enum {
     S_IDLE = 0,		/* Resource is not in use; owned by default owner */
     S_REQUESTING,	/* Requesting the resource from the default owner */
+    S_IMMREQUESTING,	/* Immediate resource request from the default owner */
     S_GRANTED,		/* One or more clients have been granted the resource */
 
     NO_CLIENT = 0xff,
@@ -126,9 +127,9 @@ implementation {
       return EBUSY;
 
     addRequesting(id);
-    if (call State.isIdle())
+    if (call State.requestState(S_REQUESTING) == SUCCESS)
       signal ResourceDefaultOwner.requested();
-    if (call State.isState(S_GRANTED))
+    else if (call State.isState(S_GRANTED))
       post grantedTask();
     return SUCCESS;
   }
@@ -142,8 +143,11 @@ implementation {
     if (call RequestingVector.get(id) || call GrantedVector.get(id))
       return EBUSY;
 
-    if (call State.isIdle())
+    if (call State.requestState(S_IMMREQUESTING) == SUCCESS) {
       signal ResourceDefaultOwner.immediateRequested();
+      if (call State.isState(S_IMMREQUESTING))
+	call State.toIdle();
+    }
     if (call State.isState(S_GRANTED)) {
       addGranted(id);
       return SUCCESS;
@@ -165,9 +169,13 @@ implementation {
 
   async command error_t ResourceDefaultOwner.release()
   {
-    if (call State.requestState(S_GRANTED) == SUCCESS) {
+    if (call State.isState(S_REQUESTING)) {
+      call State.forceState(S_GRANTED);
       post grantedTask();
       return SUCCESS;
+    } else if (call State.isState(S_IMMREQUESTING)) {
+      call State.forceState(S_GRANTED);
+      return SUCCESS;
     } else
       return FAIL;
   }