diff --git a/INSTALL b/INSTALL index 85066b2..b44eeeb 100755 --- a/INSTALL +++ b/INSTALL @@ -82,7 +82,7 @@ for file in `ls sbin | grep -v '\.sh'`; do done # Package versions -LIBXML2_VERSION="2.9.3" +LIBXML2_VERSION="2.9.4" LIBXML_RUBY_VERSION="2.8.0" SYSTEMTIMER_VERSION="1.2.3" SQLITE3_VERSION="autoconf-3120200" diff --git a/lib/workflowmgr/cobaltbatchsystem.rb b/lib/workflowmgr/cobaltbatchsystem.rb index 0112c2c..bd160f7 100644 --- a/lib/workflowmgr/cobaltbatchsystem.rb +++ b/lib/workflowmgr/cobaltbatchsystem.rb @@ -248,7 +248,6 @@ def refresh_jobqueue queued_jobs=nil - GC.start end # job_queue diff --git a/lib/workflowmgr/moabbatchsystem.rb b/lib/workflowmgr/moabbatchsystem.rb index f6d2e0d..4923e26 100644 --- a/lib/workflowmgr/moabbatchsystem.rb +++ b/lib/workflowmgr/moabbatchsystem.rb @@ -244,7 +244,6 @@ def refresh_jobqueue } # queued_jobs.find queued_jobs=nil - GC.start end @@ -319,7 +318,6 @@ def refresh_jobacct } recordxml=nil - GC.start end diff --git a/lib/workflowmgr/moabtorquebatchsystem.rb b/lib/workflowmgr/moabtorquebatchsystem.rb index c9a2ebf..639ac4b 100644 --- a/lib/workflowmgr/moabtorquebatchsystem.rb +++ b/lib/workflowmgr/moabtorquebatchsystem.rb @@ -206,7 +206,6 @@ def refresh_jobqueue } # queued_jobs.find queued_jobs=nil - GC.start end @@ -280,7 +279,6 @@ def refresh_jobacct } recordxml=nil - GC.start end diff --git a/lib/workflowmgr/sgebatchsystem.rb b/lib/workflowmgr/sgebatchsystem.rb index f3044bc..7cae465 100644 --- a/lib/workflowmgr/sgebatchsystem.rb +++ b/lib/workflowmgr/sgebatchsystem.rb @@ -353,7 +353,6 @@ def refresh_jobqueue } # queued_jobs.find queued_jobs=nil - GC.start end diff --git a/lib/workflowmgr/torquebatchsystem.rb b/lib/workflowmgr/torquebatchsystem.rb index 3a12e8e..d941b95 100644 --- a/lib/workflowmgr/torquebatchsystem.rb +++ b/lib/workflowmgr/torquebatchsystem.rb @@ -258,7 +258,6 @@ def refresh_jobqueue } # queued_jobs.find queued_jobs=nil - GC.start end # job_queue diff --git a/lib/workflowmgr/utilities.rb b/lib/workflowmgr/utilities.rb index 21b16d2..4cf09fe 100755 --- a/lib/workflowmgr/utilities.rb +++ b/lib/workflowmgr/utilities.rb @@ -263,8 +263,6 @@ def WorkflowMgr.run4(command,timeout=30) [output,error,exit_status] ensure - # Make sure we turn garbage collection back on! - GC.enable end diff --git a/lib/workflowmgr/workflowdoc.rb b/lib/workflowmgr/workflowdoc.rb index 2aeb9ec..e4260b8 100644 --- a/lib/workflowmgr/workflowdoc.rb +++ b/lib/workflowmgr/workflowdoc.rb @@ -732,10 +732,6 @@ def expand_metataskdeps @workflowdoc.root.each_element {|ch| if ch.name == "task" - # Initiate garbage collection to avoid seg faults resulting from LibXML - # memory management issues/bugs - GC.start - # Find the metataskdep nodes metataskdeps=ch.find('.//metataskdep') @@ -795,10 +791,6 @@ def expand_serialdeps depnode=nil andnode=nil - # Initiate garbage collection to avoid seg faults resulting from LibXML - # memory management issues/bugs - GC.start - # Add dependencies for each serial metatask that this task is a member of metatasklist=ch.attributes["metatasks"] metatasklist.split(",").each_with_index do |m,idx| diff --git a/lib/workflowmgr/workflowengine.rb b/lib/workflowmgr/workflowengine.rb index 944b806..2c3752d 100644 --- a/lib/workflowmgr/workflowengine.rb +++ b/lib/workflowmgr/workflowengine.rb @@ -36,6 +36,9 @@ def initialize(options) begin + # Disable garbage collection + GC.disable + # Turn on full program tracing for verbosity 1000+ if WorkflowMgr::VERBOSE > 999 set_trace_func proc { |event,file,line,id,binding,classname| printf "%10s %s:%-2d %10s %8s\n",event,file,line,id,classname } diff --git a/tarfiles/libxml2-2.9.3.tar.gz b/tarfiles/libxml2-2.9.3.tar.gz deleted file mode 100644 index 5b5ff1b..0000000 Binary files a/tarfiles/libxml2-2.9.3.tar.gz and /dev/null differ diff --git a/tarfiles/libxml2-2.9.4.tar.gz b/tarfiles/libxml2-2.9.4.tar.gz new file mode 100644 index 0000000..dbe16ea Binary files /dev/null and b/tarfiles/libxml2-2.9.4.tar.gz differ diff --git a/test/test.xml b/test/test.xml index b945cec..7b13ee7 100644 --- a/test/test.xml +++ b/test/test.xml @@ -22,6 +22,13 @@ +