From: Uri Guttman <uri@quad.(none)>
Date: Tue, 15 Sep 2009 17:54:48 +0000 (-0400)
Subject: merging
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d88e43718237ee11b2a4458ed280dccfe6aea2d7;p=urisagit%2FStem.git

merging
---

d88e43718237ee11b2a4458ed280dccfe6aea2d7
diff --cc lib/Stem/Event.pm
index 9c2caef,1df1a00..712ccc7
--- a/lib/Stem/Event.pm
+++ b/lib/Stem/Event.pm
@@@ -69,9 -69,10 +69,14 @@@ INIT{ init_loop() ; 
  
  sub init_loop {
  
+ Stem::Event::Queue::_init_queue() if defined &Stem::Event::Queue::_init_queue ;
+ 
  	$loop_class->_init_loop() ;
  
++<<<<<<< HEAD:lib/Stem/Event.pm
 +#Stem::Event::Queue::_init_queue() if defined &Stem::Event::Queue::_init_queue ;
++=======
++>>>>>>> master:lib/Stem/Event.pm
  
  }
  
@@@ -315,7 -322,6 +326,10 @@@ print "not found\n" 
  ############################################################################
  
  package Stem::Event::Plain ;
++<<<<<<< HEAD:lib/Stem/Event.pm
 +
++=======
++>>>>>>> master:lib/Stem/Event.pm
  our @ISA = qw( Stem::Event ) ;
  
  =head2 Stem::Event::Plain::new
@@@ -372,7 -378,6 +386,10 @@@ sub new 
  ############################################################################
  
  package Stem::Event::Signal ;
++<<<<<<< HEAD:lib/Stem/Event.pm
 +
++=======
++>>>>>>> master:lib/Stem/Event.pm
  our @ISA = qw( Stem::Event ) ;
  
  =head2 Stem::Event::Signal::new
@@@ -459,7 -464,6 +476,10 @@@ sub new 
  ############################################################################
  
  package Stem::Event::Timer ;
++<<<<<<< HEAD:lib/Stem/Event.pm
 +
++=======
++>>>>>>> master:lib/Stem/Event.pm
  our @ISA = qw( Stem::Event ) ;
  
  =head2 Stem::Event::Timer::new
@@@ -649,7 -653,6 +669,10 @@@ sub timer_triggered 
  # these override Stem::Event's methods and then call those via SUPER::
  
  package Stem::Event::IO ;
++<<<<<<< HEAD:lib/Stem/Event.pm
 +
++=======
++>>>>>>> master:lib/Stem/Event.pm
  our @ISA = qw( Stem::Event ) ;
  
  sub init_io_timeout {
@@@ -723,8 -726,9 +746,13 @@@ sub timed_out 
  #######################################################
  
  package Stem::Event::Read ;
+ our @ISA = qw( Stem::Event::IO ) ;
+ print "B @ISA\n" ;
  
++<<<<<<< HEAD:lib/Stem/Event.pm
 +our @ISA = qw( Stem::Event::IO ) ;
++=======
++>>>>>>> master:lib/Stem/Event.pm
  
  =head2 Stem::Event::Read::new
  
@@@ -822,7 -828,6 +852,10 @@@ print "@ISA\n" 
  ############################################################################
  
  package Stem::Event::Write ;
++<<<<<<< HEAD:lib/Stem/Event.pm
 +
++=======
++>>>>>>> master:lib/Stem/Event.pm
  our @ISA = qw( Stem::Event::IO ) ;
  
  =head2 Stem::Event::Write::new
diff --cc lib/Stem/Event/Queue.pm
index 53db4fa,241bba3..c473237
--- a/lib/Stem/Event/Queue.pm
+++ b/lib/Stem/Event/Queue.pm
@@@ -48,13 -49,14 +49,18 @@@ use warnings 
  use Socket;
  use IO::Handle ;
  
++<<<<<<< HEAD:lib/Stem/Event/Queue.pm
 +my( $self, $queue_read, $queue_write, $queue_read_event, $queue_has_event ) ;
++=======
+ use base 'Exporter' ;
+ our @EXPORT = qw( mark_not_empty ) ;
++>>>>>>> master:lib/Stem/Event/Queue.pm
  
 -my( $queue_read, $queue_write, $queue_read_event ) ;
 +sub _init_event_queue {
  
 -my $self ;
 +	return if $self ;
  
 -sub _init_queue {
 +	$self = bless {} ;
  
  	socketpair( $queue_read, $queue_write,
  		 AF_UNIX, SOCK_STREAM, PF_UNSPEC ) || die <<DIE ;
diff --cc lib/Stem/Event/Signal.pm
index 95e1023,14a85ba..6523103
--- a/lib/Stem/Event/Signal.pm
+++ b/lib/Stem/Event/Signal.pm
@@@ -32,9 -32,8 +32,14 @@@ sub _build 
  
  	$SIG{ $signal } = $cached_handlers{$signal} ||=
  		sub {
++<<<<<<< HEAD:lib/Stem/Event/Signal.pm
 +	Stem::Event::Queue::queue_has_event() ;
 +			
 +#print "HIT $signal\n";
++=======
+ print "HIT $signal\n";
+ 			Stem::Event::Queue::mark_not_empty() ;
++>>>>>>> master:lib/Stem/Event/Signal.pm
  			push @signal_queue, $signal
  		} ;
  
diff --cc t/event/event_test.pl
index 4f54906,faefbfe..1615ff8
--- a/t/event/event_test.pl
+++ b/t/event/event_test.pl
@@@ -63,7 -63,8 +63,12 @@@ sub triggered 
  
  	my( $self ) = @_ ;
  
++<<<<<<< HEAD:t/event/event_test.pl
 +	ok( 1, 'plain - event triggered' ) ;
++=======
+ 	ok( 1, 'plain event triggered' ) ;
+ 	Stem::Event::stop_loop() ;
++>>>>>>> master:t/event/event_test.pl
  }
  
  sub test_signal_events {
@@@ -141,7 -154,9 +158,13 @@@ sub hard_timeout 
  
  	my( $self ) = @_ ;
  
++<<<<<<< HEAD:t/event/event_test.pl
 +	ok( 1, 'hard timer - event triggered' ) ;
++=======
+ send_int_signal() ;
+ 
+ 	ok( 1, 'hard timer event triggered' ) ;
++>>>>>>> master:t/event/event_test.pl
  
  	if ( --$self->{'hard_timer_count'} > 0 ) {