Changeset 226

Timestamp:

06/11/05 18:39:00 (3 years ago)

Author:

ged

Message:

- Moved locking methods that should have gone over to GameObject? with the mutex

move.

Location:

trunk/lib/fm

Files:

• entity.rb (modified) (3 diffs)
• gameobject.rb (modified) (2 diffs)

trunk/lib/fm/entity.rb

@@ -105 +105 @@
 
 
+    #########
+    protected
+    #########
+
+    ### Fallback event handler. The default implementation of this method
+    ### just raises an UnhandledEventError, so deriviatives will probably
+    ### want to override it.
+    def handleAnyEvent( event )
+        raise FaerieMUD::UnhandledEventError,
+              "No handler defined for #{event.class.name}s"
+    end
+
+
     ### Get a handler as a callable object for the given +event+.
     def getHandlerForEvent( event )
@@ -140 +153 @@
 
 
-    ### Fallback event handler. The default implementation of this method
-    ### just raises an UnhandledEventError, so deriviatives will probably
-    ### want to override it.
-    def handleAnyEvent( event )
-        raise FaerieMUD::UnhandledEventError,
-              "No handler defined for #{event.class.name}s"
-    end
-
-
     ### Callback invoked whenever a singleton method is added to the
     ### receiver. Clears the event handler lookup cache if the method being
@@ -161 +165 @@
     alias_method :singleton_method_undefined, :singleton_method_added
 
-
-    #############################################################
-    ### L O C K I N G   M E T H O D S
-    #############################################################
-
-    ### Obtain a shared lock on the receiver for the duration of the
-    ### block. The mutex object is passed as argument.
-    def readlocked
-        return unless block_given?
-        @mutex.synchronize( Sync::SH ) {
-            yield( @mutex )
-        }
-    end
-
-
-    #########
-    protected
-    #########
-
-    ### Obtain an exclusive lock on the receiver for the durection of the
-    ### block. The mutex object is passed as argument.
-    def writelocked
-        return unless block_given?
-        @mutex.synchronize( Sync::EX ) {
-            yield( @mutex )
-        }
-    end
-
 end # class FaerieMUD::Entity
 

trunk/lib/fm/gameobject.rb

@@ -198 +198 @@
 
 
-
     ### Return the number of contribution points for the given +author+ (a
     ### String) the object is worth.
     def contribution( author )
         self.class.authors[ author ]
+    end
+
+
+    ### Obtain a shared lock on the receiver for the duration of the
+    ### block. The mutex object is passed as argument.
+    def readlocked
+        return unless block_given?
+        @mutex.synchronize( Sync::SH ) {
+            yield( @mutex )
+        }
     end
 
@@ -224 +233 @@
     protected
     #########
+
+    ### Obtain an exclusive lock on the receiver for the durection of the
+    ### block. The mutex object is passed as argument.
+    def writelocked
+        return unless block_given?
+        @mutex.synchronize( Sync::EX ) {
+            yield( @mutex )
+        }
+    end
+
 
     ### Return an HTML fragment for the header part of the given object.