Move block reservation signal serialization to Layout

[r2c2.git] / source / libr2c2 / layout.cpp

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 0901382b91d0f140bb8ddf39010bf41228b33bfb..72f083d57cc2da491dead13077ad495b716f5942 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <msp/core/maputils.h>
+#include <msp/core/raii.h>
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include <msp/datafile/writer.h>
@@ -40,7 +41,8 @@ namespace R2C2 {
 Layout::Layout(Catalogue &c, Driver *d):
        catalogue(c),
        driver(d),
-       next_turnout_addr(0x800)
+       next_turnout_addr(0x800),
+       emitting_block_reserved(false)
 {
        clock.set_rate(60);
 }
@@ -69,31 +71,69 @@ Driver &Layout::get_driver() const
 void Layout::add(Object &o)
 {
        if(objects.insert(o))
-               signal_object_added.emit(o);
+       {
+               try
+               {
+                       signal_object_added.emit(o);
+               }
+               catch(...)
+               {
+                       objects.erase(o);
+                       throw;
+               }
+       }
 }
 
 void Layout::add(Track &t)
 {
        if(objects.insert(t))
        {
-               // Blocks must be recreated first
-               create_blocks();
-               signal_object_added.emit(t);
+               try
+               {
+                       // Blocks must be recreated first
+                       create_blocks();
+                       signal_object_added.emit(t);
+               }
+               catch(...)
+               {
+                       objects.erase(t);
+                       create_blocks();
+                       throw;
+               }
        }
 }
 
 void Layout::add(TrackChain &g)
 {
        if(track_chains.insert(g))
-               signal_track_chain_added.emit(g);
+       {
+               try
+               {
+                       signal_track_chain_added.emit(g);
+               }
+               catch(...)
+               {
+                       track_chains.erase(g);
+                       throw;
+               }
+       }
 }
 
 void Layout::add(Block &b)
 {
        if(track_chains.insert(b))
        {
-               b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
-               signal_track_chain_added.emit(b);
+               sigc::connection conn = b.signal_reserved.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::block_reserved), sigc::ref(b)));
+               try
+               {
+                       signal_track_chain_added.emit(b);
+               }
+               catch(...)
+               {
+                       track_chains.erase(b);
+                       conn.disconnect();
+                       throw;
+               }
        }
 }
 
@@ -508,6 +548,23 @@ void Layout::sensor_state_changed(Sensor &sensor, Sensor::State state)
        }
 }
 
+void Layout::block_reserved(Block &block, Train *train)
+{
+       if(emitting_block_reserved)
+               block_reserve_queue.push_back(BlockReservation(block, train));
+       else
+       {
+               SetFlag setf(emitting_block_reserved);
+               signal_block_reserved.emit(block, train);
+               while(!block_reserve_queue.empty())
+               {
+                       BlockReservation br = block_reserve_queue.front();
+                       block_reserve_queue.pop_front();
+                       signal_block_reserved.emit(br.block, br.train);
+               }
+       }
+}
+
 
 template<typename B>
 Layout::Storage<B>::~Storage()
@@ -562,6 +619,12 @@ void Layout::Storage<B>::del()
 }
 
 
+Layout::BlockReservation::BlockReservation(Block &b, Train *t):
+       block(b),
+       train(t)
+{ }
+
+
 Layout::Loader::Loader(Layout &l):
        DataFile::ObjectLoader<Layout>(l)
 {