cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r103:933325ce824a` public

parent | child

Description:

locks dir based on temp file, does not copy dir when copying scripts, added proper rescue for ln_s

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r103:933325ce824a - Sun, 25 Apr 2010 02:11:41 - 4 files changed: 4 inserted, 3 deleted

lib/dir_init.rb ¶ +1 -1

               # there are many concurrent processes that wants to modify the
               # directory in the same way.
               #
               # An example usage is when each process wants to copy some temporary
               # files to the directory and delete these files after finishing its
               # job.  Problems may occur when the first process delete the files
               # while the second process is still using the files.
               #
               # This library maintain a reference counter on the processes using the
               # directory.  It locks the dir to manage critical section when
               # updating the reference counter.
               module DirInit
                 class Manager
                   def initialize(dir_name, usage_filename='.usage_counter')
                     @dir_name = dir_name
                     @usage_filename = usage_filename
                   end
                   # Check if someone has initialized the dir.  If not, call block.
                   def setup    # :yields: block
-            -       dir = File.new(@dir_name)
+            +       dir = File.new(@dir_name + '/lockfile',"w+")
                     dir.flock(File::LOCK_EX)
                     begin
                       counter_filename = get_counter_filename
                       if File.exist? counter_filename
                         # someone is here
                         f = File.new(counter_filename,"r+")
                         counter = f.read.to_i
                         f.seek(0)
                         f.write("#{counter+1}\n")
                         f.close
                       else
                         # i'm the first, create the counter file
                         counter = 0
                         f = File.new(counter_filename,"w")
                         f.write("1\n")
                         f.close
                       end
                       # if no one is here
                       if counter == 0
                         if block_given?
                           yield
                         end
                       end

lib/engine.rb ¶ +1

                     talk grading_dir
                     Dir.chdir grading_dir
                     cmd = "#{problem_home}/script/judge #{language} #{fname}"
                     talk "CMD: #{cmd}"
                     system(cmd)
                   end
                   def get_std_script_dir
                     GRADER_ROOT + '/std-script'
                   end
                   def copy_script(problem_home)
                     script_dir = "#{problem_home}/script"
                     std_script_dir = get_std_script_dir
                     raise "std-script directory not found" if !FileTest.exist?(std_script_dir)
                     scripts = Dir[std_script_dir + '/*']
                     copied = []
                     scripts.each do |s|
                       fname = File.basename(s)
+            +         next if FileTest.directory?(s)
                       if !FileTest.exist?("#{script_dir}/#{fname}")
                         copied << fname
                         FileUtils.cp(s, "#{script_dir}")
                       end
                     end
                     return copied
                   end
                   def copy_log_filename(problem_home)
                     return File.join(problem_home, '.scripts_copied')
                   end
                   def save_copy_log(problem_home, log)
                     f = File.new(copy_log_filename(problem_home),"w")
                     log.each do |fname|
                       f.write("#{fname}\n")
                     end
                     f.close
                   end
                   def load_copy_log(problem_home)
                     f = File.new(copy_log_filename(problem_home),"r")
                     log = []

lib/test_request_helper.rb ¶ +1 -1

               #
               # This part contains various test_request helpers for interfacing
               # with Grader::Engine.  There are TestRequestRoomMaker and
               # TestRequestReporter.
               module Grader
                 def self.link_or_copy(src, des)
                   begin
                     FileUtils.ln_s(src, des)
-            -     rescue
+            +     rescue NotImplementedError
                     FileUtils.cp(src,des)
                   end
                 end
                 def self.call_and_log(error_message)
                   begin
                     yield
                   rescue
                     msg = "ERROR: #{error_message}"
                     raise msg
                   end
                 end
                 #
                 # A TestRequestRoomMaker is a helper object for Engine
                 # - finds grading room: in user_result_dir/(user)/test_request/ ...
                 # - prepare problem configuration for grading --- basically it copy
                 #   all config files, and copy user's input into the testcase
                 #   directory.  First, it finds the template from problem template
                 #   directory; if it can't find a template, it'll use the template
                 #   from default template.
                 class TestRequestRoomMaker
                   def initialize
                     @config = Grader::Configuration.get_instance

std-script/.gitignore ¶ +1 -1

		@@ -1,2 +1,2
1	1	box
2		-
	2	+ box.exe

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r103:933325ce824a - Sun, 25 Apr 2010 02:11:41 - 4 files changed: 4 inserted, 3 deleted

Sign in to your account

Commit r103:933325ce824a public

Author

r103:933325ce824a - Sun, 25 Apr 2010 02:11:41 - 4 files changed: 4 inserted, 3 deleted

Commit `r103:933325ce824a` public