coderunner 0.14.20 → 0.14.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3133f820a90276cbb825f364339dce211b4a8eaa
-  data.tar.gz: aeb2d5d11ba47ab20f463e37952e779dbb70a53e
+  metadata.gz: f31da7c1a3066436f1928a1e63927d1ae159c7c1
+  data.tar.gz: 2fbf034e17fffa91edb9f7e1b6cccb303d96d5b2
 SHA512:
-  metadata.gz: 1abf12ee0c95e4b2d7d4c82c33d1d42a4b66cdf609dfbe117b5d79d7f0ef037212f3c44cce7f13c59ce47f7b1633ae7e02a84429dd7daf66a4e2f8e302a68405
-  data.tar.gz: b9cb95eed51cfe9a4d20d1f8a440cbce41f1a11a4184a859a34ed115525dad5fa7bc14da0a33f903aa902abd26aa55539680ca73f4014afcd4b188edd1e50329
+  metadata.gz: c9210fef0749606da3dbe287e1b7ea262ae709be197eda71410b2a4f4e68c414ec1bca67c859f29b05fe302ae0634b743990ce29687e1b47d17f0730c147da37
+  data.tar.gz: 842086ee9b7c6e62d144bb68724b83797040bb3b6bb8a90c06102ce40baa48bb658e0c508526e79717c14f77fa52bea6da3cb02b9fb77751a74aa42a5ba1971c

data/VERSION

@@ -1 +1 @@
-0.14.20
+0.14.21

data/coderunner.gemspec

@@ -2,12 +2,12 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: coderunner 0.14.20 ruby lib
+# stub: coderunner 0.14.21 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.14.20"
+  s.version = "0.14.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/coderunner/class_methods.rb

@@ -335,52 +335,75 @@ EOF
     eputs "Starting launcher\n"
 		at_exit{FileUtils.rm_r tl}
     FileUtils.makedirs tl
-		Thread.new{loop{`cp #{tl}/queue_status.txt #{tl}/queue_status2.txt; ps > #{tl}/queue_status.txt`; sleep 1}}
-		
-    mutex = Mutex.new
-    processes= []
-
-		Thread.new do
-			loop do
-        Dir.entries(tl).each do |file|
-          next unless file =~ (/(^.*)\.stop/)
-					pid = $1
-					mutex.synchronize{Process.kill(pid); processes.delete pid}
+
+		unless ENV['CODE_RUNNER_LAUNCHER'] =~ /serial/
+			Thread.new{loop{`cp #{tl}/queue_status.txt #{tl}/queue_status2.txt; ps > #{tl}/queue_status.txt`; sleep 1}}
+			
+			mutex = Mutex.new
+			processes= []
+
+			Thread.new do
+				loop do
+					Dir.entries(tl).each do |file|
+						next unless file =~ (/(^.*)\.stop/)
+						pid = $1
+						mutex.synchronize{Process.kill(pid); processes.delete pid}
+					end
+					sleep refresh.to_i
+				end
+			end
+
+			#Dir.chdir(tl) do
+				ppid = $$
+				loop do
+					sleep refresh.to_i while processes.size >= max_queue.to_i
+	#         processes = []
+					Dir.entries(tl).grep(/(^.*)\.start/).each do |file|
+						file =~ (/(^.*)\.start/)
+						id = $1
+						command = ""
+						command = File.read tl + '/' + file while command == ""
+						pid = fork do
+							processes.each do |wpid|
+								# Make sure all previously submitted jobs have finished.
+								sleep refresh.to_i while %x[ps -e -o pid,ppid].split("\n").grep(Regexp.new("^\\s*#{wpid}\\s+#{ppid}")).size > 0
+							end              
+							#p ["command", command]
+							exec(command + "; wait")
+						end
+						`cp #{tl}/queue_status.txt #{tl}/queue_status2.txt; ps > #{tl}/queue_status.txt`
+						mutex.synchronize{processes.push pid}
+
+						File.open(tl + '/' + id + '.pid', 'w'){|file| file.puts pid}
+						FileUtils.rm(tl + '/' + file)
+						
+						Thread.new{Process.wait pid; mutex.synchronize{processes.delete pid}}
+					end
+	#         processes.each{|pid| Process.wait pid}
+					sleep refresh.to_i
+				end
+			#end
+				#
+			else
+				loop do
+					Dir.entries(tl).grep(/(^.*)\.start/).each do |file|
+						file =~ (/(^.*)\.start/)
+						id = $1
+						command = ""
+						command = File.read tl + '/' + file while command == ""
+						pid = 12345
+						File.open(tl + '/' + id + '.pid', 'w'){|file| file.puts pid}
+						File.open("#{tl}/queue_status.txt", "w"){|file| file.puts pid}
+						`cp #{tl}/queue_status.txt #{tl}/queue_status2.txt`
+						FileUtils.rm(tl + '/' + file)
+						system "#{command} \n\n wait \n\n"
+						File.open("#{tl}/queue_status.txt", "w"){|file| file.puts}
+						`cp #{tl}/queue_status.txt #{tl}/queue_status2.txt`
+					end
+					sleep refresh.to_i
 				end
-				sleep refresh.to_i
 			end
-		end
 
-    #Dir.chdir(tl) do
-      ppid = $$
-      loop do
-				sleep refresh.to_i while processes.size >= max_queue.to_i
-#         processes = []
-        Dir.entries(tl).grep(/(^.*)\.start/).each do |file|
-          file =~ (/(^.*)\.start/)
-          id = $1
-					command = ""
-          command = File.read tl + '/' + file while command == ""
-          pid = fork do
-            processes.each do |wpid|
-							# Make sure all previously submitted jobs have finished.
-              sleep refresh.to_i while %x[ps -e -o pid,ppid].split("\n").grep(Regexp.new("^\\s*#{wpid}\\s+#{ppid}")).size > 0
-            end              
-						#p ["command", command]
-            exec(command + "; wait")
-          end
-					`cp #{tl}/queue_status.txt #{tl}/queue_status2.txt; ps > #{tl}/queue_status.txt`
-          mutex.synchronize{processes.push pid}
-
-          File.open(tl + '/' + id + '.pid', 'w'){|file| file.puts pid}
-          FileUtils.rm(tl + '/' + file)
-          
-          Thread.new{Process.wait pid; mutex.synchronize{processes.delete pid}}
-        end
-#         processes.each{|pid| Process.wait pid}
-        sleep refresh.to_i
-      end
-    #end
   end
       
 	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.14.20
+  version: 0.14.21
 platform: ruby
 authors:
 - Edmund Highcock