taskjuggler 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,10 @@
+= Release 0.2.1 (2011-07-13)
+
+== Bug Fixes
+
+  * Fix scheduler deadlock problem.
+
+
 = Release 0.2.0 (2011-07-10)
 
 == New Features

data/data/tjp.vim

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     TaskJuggler
 " Maintainer:   TaskJuggler Developers <taskjuggler-devel@googlegroups.com>
-" Last Change:  2011-07-10 12:20:41 +0200
+" Last Change:  2011-07-13 20:16:00 +0200
 " This file was automatically generated by VimSyntax.rb
 
 if exists("b:current_syntax")

data/lib/exchangebug.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = exchangebug.rb -- The TaskJuggler III Project Management Software
+#
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+require 'mail'
+
+Mail.defaults do
+  delivery_method :smtp, {
+    :address => 'storexbh1.amd.com',
+    :port => 25
+  }
+end
+
+mail = Mail.deliver do
+  #to [ 'Test.STOREXPF1@amd.com', 'Test.Storexmbp01@amd.com', 'dl.xadm-in@amd.com' ]
+  to 'Chris.Schlaeger@amd.com'
+  from 'timesheets@taskjuggler.amd.com'
+  subject 'Mail that gets corrupted by Exchange Server'
+  text_part do
+    content_type [ 'text', 'plain', { 'charset' => 'UTF-8' } ]
+    content_transfer_encoding 'quoted-printable'
+    body "This is the plain text part.\nCorrupted mails no longer have this content."
+  end
+  html_part do
+    content_type 'text/html; charset=UTF-8'
+    content_transfer_encoding 'quoted-printable'
+    body "<h1>This is the HTML part.\nCorrupted mails have this text in the text/plain part as well.</h1>"
+  end
+end
+#mail.deliver
+
+puts "The following mail has been sent out:\n"
+puts mail.to_s

data/lib/ruby-signal-bug.rb

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = ruby-signal-bug.rb -- The TaskJuggler III Project Management Software
+#
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+
+require 'BatchProcessor'
+
+def test_fileIO
+  # First parameter should be larger than the number of CPU cores.
+  doRun(3, 2000) do
+    fname = "test#{$$}.txt"
+    f = File.new(fname, 'w')
+    0.upto(10000) do |i|
+      f.puts "#{i} Hello, world! "
+    end
+    f.close
+    File.delete(fname)
+
+    # Allow some time for the OS to recycle file descriptors.
+    sleep(0.05)
+  end
+end
+
+def doRun(maxCPUs, jobs, &block)
+  # Create a BatchProcessor
+  bp = TaskJuggler::BatchProcessor.new(maxCPUs)
+
+  # Queue jobs
+  jobs.times do |i|
+    bp.queue("job #{i}") { yield }
+  end
+
+  ok = error = 0
+
+  # Wait for them to finish
+  bp.wait do |j|
+    if j.retVal.signaled?
+      error += 1
+    else
+      ok += 1
+    end
+  end
+  puts "Ok: #{ok}  Errors: #{error}"
+end
+
+test_fileIO

data/lib/taskjuggler/DataCache.rb

@@ -77,58 +77,23 @@ class TaskJuggler
       @entries = {}
     end
 
-    # Store _value_ into the cache using _key_ to tag it. _key_ must be unique
-    # and must be used to load the value from the cache again. You cannot
-    # store nil values!
-    def store(value, key)
-      @stores += 1
-
-      if @entries.size > @highWaterMark
-        while @entries.size > @lowWaterMark
-          # How many entries do we need to delete to get to the low watermark?
-          toDelete = @entries.size - @lowWaterMark
-          @entries.delete_if do |foo, e|
-            # Hit counts age with every cleanup.
-            (e.hits -= 1) < 0 && (toDelete -= 1) >= 0
-          end
-        end
-      end
-
-      @entries[key] = DataCacheEntry.new(value)
-
-      value
-    end
-
   if RUBY_VERSION < '1.9.0'
 
     # Ruby 1.8 has a buggy hash key generation algorithm that leads to many
     # hash collisions. We completely disable caching on 1.8.
 
-    def load(key)
-      nil
-    end
-
-    def cached(key)
+    def cached(*args)
       yield
     end
 
   else
 
-    # Retrieve the value indexed by _key_ from the cache. If it's not found,
-    # nil is returned.
-    def load(key)
-      if (e = @entries[key])
-        @hits += 1
-        e.value
-      else
-        @misses += 1
-        nil
-      end
-    end
-
-    # If we have a value for the _key_, return the value. Otherwise call the
+    # _args_ is a set of arguments that unambigously identify the data entry.
+    # It's converted into a hash to store or recover a previously stored
+    # entry. If we have a value for the key, return the value. Otherwise call the
     # block to compute the value, store it and return it.
-    def cached(key)
+    def cached(*args)
+      key = args.hash
       if @entries.has_key?(key)
         e = @entries[key]
         @hits += 1
@@ -149,6 +114,30 @@ Hit Rate: #{@hits * 100.0 / (@hits + @misses)}%
 EOT
     end
 
+    private
+
+    # Store _value_ into the cache using _key_ to tag it. _key_ must be unique
+    # and must be used to load the value from the cache again. You cannot
+    # store nil values!
+    def store(value, key)
+      @stores += 1
+
+      if @entries.size > @highWaterMark
+        while @entries.size > @lowWaterMark
+          # How many entries do we need to delete to get to the low watermark?
+          toDelete = @entries.size - @lowWaterMark
+          @entries.delete_if do |foo, e|
+            # Hit counts age with every cleanup.
+            (e.hits -= 1) < 0 && (toDelete -= 1) >= 0
+          end
+        end
+      end
+
+      @entries[key] = DataCacheEntry.new(value)
+
+      value
+    end
+
   end
 
 end

data/lib/taskjuggler/ResourceScenario.rb

@@ -314,28 +314,27 @@ class TaskJuggler
       return 0.0 if startIdx >= endIdx || (task && !@duties.include?(task))
 
       # The unique key we use to address the result in the cache.
-      key = [ self, :ResourceScenarioEffectiveWork, startIdx, endIdx,
-              task ].hash
-      work = @dCache.load(key)
-      return work if work
-
-      # Convert the interval dates to indexes if needed.
-      startIdx = @project.dateToIdx(startIdx) if startIdx.is_a?(TjTime)
-      endIdx = @project.dateToIdx(endIdx) if endIdx.is_a?(TjTime)
-
-      work = 0.0
-      if @property.container?
-        @property.kids.each do |resource|
-          work += resource.getEffectiveWork(@scenarioIdx, startIdx, endIdx, task)
+      @dCache.cached(self, :ResourceScenarioEffectiveWork, startIdx, endIdx,
+                     task) do
+        # Convert the interval dates to indexes if needed.
+        startIdx = @project.dateToIdx(startIdx) if startIdx.is_a?(TjTime)
+        endIdx = @project.dateToIdx(endIdx) if endIdx.is_a?(TjTime)
+
+        work = 0.0
+        if @property.container?
+          @property.kids.each do |resource|
+            work += resource.getEffectiveWork(@scenarioIdx, startIdx, endIdx,
+                                              task)
+          end
+        else
+          unless @scoreboard.nil?
+            work = @project.convertToDailyLoad(
+                     getAllocatedSlots(startIdx, endIdx, task) *
+                     @project['scheduleGranularity']) * @efficiency
+          end
         end
-      else
-        return 0.0 if @scoreboard.nil?
-
-        work = @project.convertToDailyLoad(
-                 getAllocatedSlots(startIdx, endIdx, task) *
-                 @project['scheduleGranularity']) * @efficiency
+        work
       end
-      @dCache.store(work, key)
     end
 
     # Returns the allocated accumulated time of this resource and its children.

data/lib/taskjuggler/TaskScenario.rb

@@ -872,7 +872,11 @@ class TaskJuggler
     # least one specified end date and a duration criteria or the other end
     # date.
     def readyForScheduling?
-      return false if @scheduled || @isRunAway
+      # If the tasks has already been scheduled, we still call it 'ready' so
+      # it will be removed from the todo list.
+      return true if @scheduled
+
+      return false if @isRunAway
 
       if @forward
         return true if @start && (hasDurationSpec? || @end)
@@ -888,6 +892,9 @@ class TaskJuggler
     # or end date has been determined and other tasks may be ready for
     # scheduling now.
     def schedule
+      # Check if the task has already been scheduled e. g. by propagateDate().
+      return true if @scheduled
+
       # Compute the date of the next slot this task wants to have scheduled.
       # This must either be the first slot ever or it must be directly
       # adjecent to the previous slot. If this task has not yet been scheduled
@@ -1428,8 +1435,7 @@ class TaskJuggler
       return 0.0 if @milestone || startIdx >= endIdx ||
                     (resource && !@assignedresources.include?(resource))
 
-      key = [ self, :TaskScenarioAllocatedTime, startIdx, endIdx, resource ].hash
-      @dCache.cached(key) do
+      @dCache.cached(self, :TaskScenarioAllocatedTime, startIdx, endIdx, resource) do
         allocatedTime = 0.0
         if @property.container?
           @property.kids.each do |task|
@@ -1459,8 +1465,7 @@ class TaskJuggler
       return 0.0 if @milestone || startIdx >= endIdx ||
                     (resource && !@assignedresources.include?(resource))
 
-      key = [ self, :TaskScenarioEffectiveWork, startIdx, endIdx, resource ].hash
-      @dCache.cached(key) do
+      @dCache.cached(self, :TaskScenarioEffectiveWork, startIdx, endIdx, resource) do
         workLoad = 0.0
         if @property.container?
           @property.kids.each do |task|
@@ -1488,9 +1493,7 @@ class TaskJuggler
       # This function is often called recursively for the same parameters. We
       # store the results in the cache to avoid repeated computations of the
       # same results.
-      key = [ self, :TaskScenarioCollectTimeOffIntervals, iv, minDuration ].hash
-      @dCache.cached(key) do
-        workLoad = @dCache.load(key)
+      @dCache.cached(self, :TaskScenarioCollectTimeOffIntervals, iv, minDuration) do
         il = IntervalList.new
         il << TimeInterval.new(@project['start'], @project['end'])
         if @property.leaf?

data/lib/taskjuggler/Tj3Config.rb

@@ -14,7 +14,7 @@
 require 'taskjuggler/UTF8String'
 require 'taskjuggler/AppConfig'
 
-AppConfig.version = '0.2.0'
+AppConfig.version = '0.2.1'
 AppConfig.packageName = 'taskjuggler'
 AppConfig.softwareName = 'TaskJuggler III'
 AppConfig.packageInfo = 'A Project Management Software'

data/prj_cfg.rb

@@ -45,6 +45,6 @@ RAKEFILE        = 'Rakefile'
 PRJ_FILE        = 'prj_cfg.rb'
 GEM_SPEC_FILE   = 'gem_spec.rb'
 DATA_FILES      = FileList["benchmarks/**/*", "examples/**/*", "manual/*", "test/all.rb", "test/MessageChecker.rb", "test/TestSuite/**/*", "spec/**/*", "data/**/*"]
-DEPENDENCIES    = { 'mail' => '2.2.15' }
-DEVEL_DEPENDENCIES = { 'rcov' => '0.9.9',
-                       'rspec' => '2.5.0' }
+DEPENDENCIES    = { 'mail' => '>= 2.2.15' }
+DEVEL_DEPENDENCIES = { 'rcov' => '>= 0.9.9',
+                       'rspec' => '>= 2.5.0' }

data/test/TestSuite/Export-Reports/refs/DST.tjp

@@ -0,0 +1,60 @@
+project prj "DST Test" "1.0" 2012-09-01-00:00-+0000 - 2012-10-31-20:00-+0000 {
+  timezone "UTC"
+  scenario plan "Plan Scenario" {
+    active yes
+  }
+}
+
+projectids prj
+
+resource r "R"
+
+task t "T" {
+  start 2012-09-03-09:00-+0000
+  end 2012-10-12-17:00-+0000
+  scheduling asap
+  scheduled
+}
+supplement task t {
+  booking r 2012-09-03-09:00-+0000 + 8.0h,
+          2012-09-04-09:00-+0000 + 8.0h,
+          2012-09-05-09:00-+0000 + 8.0h,
+          2012-09-06-09:00-+0000 + 8.0h,
+          2012-09-07-09:00-+0000 + 8.0h,
+          2012-09-10-09:00-+0000 + 8.0h,
+          2012-09-11-09:00-+0000 + 8.0h,
+          2012-09-12-09:00-+0000 + 8.0h,
+          2012-09-13-09:00-+0000 + 8.0h,
+          2012-09-14-09:00-+0000 + 8.0h,
+          2012-09-17-09:00-+0000 + 8.0h,
+          2012-09-18-09:00-+0000 + 8.0h,
+          2012-09-19-09:00-+0000 + 8.0h,
+          2012-09-20-09:00-+0000 + 8.0h,
+          2012-09-21-09:00-+0000 + 8.0h,
+          2012-09-24-09:00-+0000 + 8.0h,
+          2012-09-25-09:00-+0000 + 8.0h,
+          2012-09-26-09:00-+0000 + 8.0h,
+          2012-09-27-09:00-+0000 + 8.0h,
+          2012-09-28-09:00-+0000 + 8.0h,
+          2012-10-01-09:00-+0000 + 8.0h,
+          2012-10-02-09:00-+0000 + 8.0h,
+          2012-10-03-09:00-+0000 + 8.0h,
+          2012-10-04-09:00-+0000 + 8.0h,
+          2012-10-05-09:00-+0000 + 8.0h,
+          2012-10-08-09:00-+0000 + 8.0h,
+          2012-10-09-09:00-+0000 + 8.0h,
+          2012-10-10-09:00-+0000 + 8.0h,
+          2012-10-11-09:00-+0000 + 8.0h,
+          2012-10-12-09:00-+0000 + 8.0h { overtime 2 }
+  priority 500
+  projectid prj
+}
+supplement resource r {
+  workinghours sun off
+               workinghours mon 9:00 - 17:00
+               workinghours tue 9:00 - 17:00
+               workinghours wed 9:00 - 17:00
+               workinghours thu 9:00 - 17:00
+               workinghours fri 9:00 - 17:00
+               workinghours sat off
+}

data/test/TestSuite/Export-Reports/refs/ReleasePlan.tjp

@@ -0,0 +1,80 @@
+project prj "Release Plan" "1.0" 2010-11-10-00:00-+0000 - 2011-02-09-06:00-+0000 {
+  timezone "UTC"
+  scenario plan "Plan Scenario" {
+    active yes
+  }
+}
+
+projectids prj
+
+
+task merge "Merge Window" {
+  start 2010-11-10-00:00-+0000
+  end 2010-11-24-00:00-+0000
+  scheduling asap
+  scheduled
+}
+task b1 "Beta 1" {
+  depends merge
+  start 2010-11-24-00:00-+0000
+  milestone
+  scheduled
+}
+task b2 "Beta 2" {
+  depends b1
+  start 2010-12-01-00:00-+0000
+  milestone
+  scheduled
+}
+task b3 "Beta 3" {
+  depends b2
+  start 2010-12-08-00:00-+0000
+  milestone
+  scheduled
+}
+task b4 "Beta 4" {
+  depends b3
+  start 2010-12-15-00:00-+0000
+  milestone
+  scheduled
+}
+task b5 "Beta 5" {
+  depends b4
+  start 2010-12-22-00:00-+0000
+  milestone
+  scheduled
+}
+task final "Final Release" {
+  depends b5
+  start 2010-12-29-00:00-+0000
+  milestone
+  scheduled
+}
+supplement task merge {
+  priority 500
+  projectid prj
+}
+supplement task b1 {
+  priority 500
+  projectid prj
+}
+supplement task b2 {
+  priority 500
+  projectid prj
+}
+supplement task b3 {
+  priority 500
+  projectid prj
+}
+supplement task b4 {
+  priority 500
+  projectid prj
+}
+supplement task b5 {
+  priority 500
+  projectid prj
+}
+supplement task final {
+  priority 500
+  projectid prj
+}