Changeset 269

Timestamp:

08/15/06 00:15:22 (2 years ago)

Author:

ged

Message:

• Changed thread-per-event model to two threads: one for user-interaction and one for simulated world events.

Files:

• trunk/docs/smoke_and_mirrors.rb (modified) (10 diffs)

trunk/docs/smoke_and_mirrors.rb

@@ -1 +1 @@
 #!/usr/bin/ruby
+
+require 'thread'
+require 'readline'
 
 #
@@ -53 +56 @@
     },
     {
-        :delay => 7,
+        :delay => 3,
         :output => "You continue walking through the forest towards Barrowton. You can\n" +
             "see the path to the town ahead of you.\n"
@@ -67 +70 @@
     # remember Barrowton
     "You have visited Barrowton only once before. You remember the folks as\n" +
-        "friendly and welcoming. You met Phaedrus there for the first time.  Aodh‡n\n" + 
+        "friendly and welcoming. You met Phaedrus there for the first time.  Aodhán\n" + 
         "once defeated a banshee not far from the town.",
 
@@ -82 +85 @@
     ### Feature: Meeting someone you don't know will only show their description
     {
-        :delay => 3,
+        :delay => 2,
         :output => "A short humanoid with bluish-grey skin walks past you, away from \n" +
             "Barrowton.\n",
     },
     {
-        :delay => 7,
+        :delay => 2,
         :output => "You have reached the entrace of Barrowton.\n",
     },
@@ -94 +97 @@
     ### Feature: Combat.
     {
-        :delay => 11,
+        :delay => 2,
         :output => "Suddenly, a rabid squirrel-monkey leaps out onto the path in \n" +
             "front of you.\n",
@@ -100 +103 @@
     
     ### Feature: complex actions as recipes
-    # use senu-oti style defense
+    # use turning defense
     {
         :delay => 1,
@@ -106 +109 @@
     },
     {
-        :delay => 2,
-        :output => "You spin on your left foot in sen-paksha, and avoid the \n" +
+        :delay => 1,
+        :output => "You spin on your left foot in a crouch, and avoid the \n" +
             "monkey's attack.\n",
     },
     {
-        :delay => 3,
+        :delay => 1,
         :output => "The monkey falls to the ground in a heap. It looks somewhat\n" +
             "dazed.\n",
     },
     {
-        :delay => 4,
+        :delay => 1,
         :output => "It shrieks in anger, and charges your leg.\n",
     },
     {
-        :delay => 5,
+        :delay => 1,
         :output => "You crouch in the cat pose, and deflect the monkey's bite with\n" +
             "your satchel with a loud thump. The monkey falls to the ground.\n",
@@ -133 +136 @@
     ### Oaths?
     ### Story elements
+
+
+    # quit
 ] 
 
 
 def debug_msg( msg )
-    $deferr.puts msg if $DEBUG
+    $deferr.puts "DEBUG>>> " + msg if $DEBUG
 end
 
@@ -150 +156 @@
 
 $defout.sync = true
-pending = ThreadGroup.new
-done = ThreadGroup.new
 
-def handle_threads
-    pending.list.each do |thr|
-        debug_msg "Joining thread %p" % [ thr ]
-        begin
-            thr.join unless thr.alive? || thr == Thread.current
-        rescue Exception => err
-            $deferr.puts "*** Error: %s" % [err.message]
-            $deferr.puts "  " + err.stacktrace.join( "\n  " ) if $DEBUG
-        end
-        done.add( thr )
+pending_events = Queue.new
+world_simulator = Thread.new do
+    puts "** World starting up **\n"
+    Thread.current.abort_on_exception = true
+    Thread.current[:run] = true
+
+    while Thread.current[:run]
+        debug_msg "Waiting on an event."
+        event = pending_events.pop
+    
+        debug_msg "Got an event. Firing in %d seconds..." % event[:delay]
+        sleep event[:delay]
+        print "\n" + event[:output] + "\n>"
     end
-
+    
+    puts "** World shutting down **\n"
 end
 
 Output.each do |event|
-    handle_threads
-
     case event
     when String
@@ -175 +181 @@
         gets
     when Hash
-        thr = Thread.new {
-            Thread.current.abort_on_exception = true
-            sleep event[:delay]; print "\n" + event[:output] + "\n>"
-        }
-        debug_msg "Started delayed event in thread: %p" % [thr]
-        pending.add( thr )
-        debug_msg "Pending thread group now has %d events" % [pending.list.length]
+        debug_msg "Queueing event '%s...' for +%ds" % 
+            event.values_at( :output, :delay )
+        pending_events.push( event )
     end
 end
 
-until pending.list.empty?
-    handle_threads
-    sleep 0.25
-end
-
-
-__END__
-
+debug_msg "Done with main loop. Injecting final event into simulator."
+world_simulator[:run] = false
+pending_events.push({ :delay => 0, :output => "Quitting." })
+debug_msg "Joining world_simulator"
+world_simulator.join
+debug_msg "Done."