smparkes-eventmachine 0.12.10.1 → 0.12.10.2

data/.gitignore

@@ -13,3 +13,4 @@ Makefile
 *.pdb
 *.dSYM
 java/src/.project
+/*eventmachine*.gem

data/eventmachine.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smparkes-eventmachine}
-  s.version = "0.12.10.1"
+  s.version = "0.12.10.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Francis Cianfrocca"]

data/ext/em.cpp

@@ -133,6 +133,7 @@ EventMachine_t::~EventMachine_t()
 	// Remove any file watch descriptors
 	while(!Files.empty()) {
 		map<int, Bindable_t*>::iterator f = Files.begin();
+                // fprintf(stderr,"unwatch ~ %d\n", f->first);
 		UnwatchFile (f->first);
 	}
 
@@ -2100,6 +2101,8 @@ const unsigned long EventMachine_t::WatchFile (const char *fpath)
 		sprintf(errbuf, "failed to open file %s for registering with inotify: %s", fpath, strerror(errno));
 		throw std::runtime_error(errbuf);
 	}
+
+        // fprintf(stderr, "watch wd %d %s\n", wd,fpath);
 	#endif
 
 	#ifdef HAVE_KQUEUE
@@ -2118,7 +2121,9 @@ const unsigned long EventMachine_t::WatchFile (const char *fpath)
 
 	if (wd != -1) {
 		Bindable_t* b = new Bindable_t();
+                // fprintf(stderr,"> insert %d %08x %08x\n",wd,Files[wd],b);
 		Files.insert(make_pair (wd, b));
+                // fprintf(stderr,"< insert %d %08x %08x %d\n",wd,Files[wd],b,Files.size());
 
 		return b->GetBinding();
 	}
@@ -2133,10 +2138,11 @@ EventMachine_t::UnwatchFile
 
 void EventMachine_t::UnwatchFile (int wd)
 {
-// fprintf(stderr, "unwatch wd %d\n", wd);
+        // fprintf(stderr, "unwatch wd %d\n", wd);
 	Bindable_t *b = Files[wd];
 	assert(b);
 	Files.erase(wd);
+        // fprintf(stderr, "< unwatch wd %d %d\n", wd,Files.count(wd));
 
 	#ifdef HAVE_INOTIFY
 	inotify_rm_watch(inotify->GetSocket(), wd);
@@ -2176,22 +2182,39 @@ void EventMachine_t::_ReadInotifyEvents()
 
 	assert(EventCallback);
 
+        // fprintf(stderr,"<> %d\n",Files.size());
+
         int returned;
 	while ((returned = read(inotify->GetSocket(), buffer, sizeof(buffer) )) > 0) {
                 int current = 0;
                 while(current< returned){
                         struct inotify_event* event = (struct inotify_event*)(buffer+current);
-                        if (event->mask & (IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE))
+                        if(Files.count(event->wd)>0){
+                          Bindable_t* bt = Files[event->wd];
+                          fprintf(stderr,"%08x %d %d %d %d %08x %x\n",buffer+current,current,event->len,returned,event->wd,bt,event->mask);
+                        } else {
+                          fprintf(stderr,"%08x %d %d %d %d %08x %x\n",buffer+current,current,event->len,returned,event->wd,0,event->mask);
+                        }
+                        if (event->mask & (IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE)){
+                          assert(Files[event->wd]);
                                 (*EventCallback)(Files [event->wd]->GetBinding(), EM_CONNECTION_READ, "modified", 8);
-                        if (event->mask & IN_MOVE_SELF)
+                        }
+                        if (event->mask & IN_MOVE_SELF){
+                          assert(Files[event->wd]);
         			(*EventCallback)(Files [event->wd]->GetBinding(), EM_CONNECTION_READ, "moved", 5);
+                        }
         		if (event->mask & IN_DELETE_SELF) {
+                          assert(Files[event->wd]);
                 		(*EventCallback)(Files [event->wd]->GetBinding(), EM_CONNECTION_READ, "deleted", 7);
+                                fprintf(stderr,"implicit\n");
                         	UnwatchFile ((int)event->wd);
+                                // fprintf(stderr,"< implicit %d %d\n", event->wd, Files.count(event->wd));
                         }
+                        fprintf(stderr,"%08x done\n",buffer+current);
                         current += sizeof(struct inotify_event) + event->len;
                 }
 	}
+        // fprintf(stderr,">< %d\n",Files.size());
 	#endif
 }
 

data/lib/eventmachine.rb

@@ -189,7 +189,7 @@ module EventMachine
   end
   @next_tick_mutex = Mutex.new
   @reactor_running = false
-  @next_tick_queue = nil
+  @next_tick_queue = []
   @threadpool = nil
   
 
@@ -274,7 +274,7 @@ module EventMachine
             @threadpool = nil
           end
 
-          @next_tick_queue = nil
+          @next_tick_queue = []
         end
         @reactor_running = false
         @reactor_thread = nil
@@ -989,11 +989,10 @@ module EventMachine
       cback.call result if cback
     end
 
-    jobs = @next_tick_mutex.synchronize do
+    @next_tick_mutex.synchronize do
       jobs, @next_tick_queue = @next_tick_queue, []
       jobs
-    end
-    jobs.each { |j| j.call }
+    end.each { |j| j.call }
   end
 
 
@@ -1092,7 +1091,7 @@ module EventMachine
   def self.next_tick pr=nil, &block
     raise ArgumentError, "no proc or block given" unless ((pr && pr.respond_to?(:call)) or block)
     @next_tick_mutex.synchronize do
-      (@next_tick_queue ||= []) << ( pr || block )
+      @next_tick_queue << ( pr || block )
     end
     signal_loopbreak if reactor_running?
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smparkes-eventmachine
 version: !ruby/object:Gem::Version 
-  version: 0.12.10.1
+  version: 0.12.10.2
 platform: ruby
 authors: 
 - Francis Cianfrocca