cafe-grader-judge-scripts

Commit r110:0bd22936dfa6 public

parent | child
Description:
Merge branch 'master' of gitorious.org:cafe-grader/cafe-grader-judge-scripts into win-local
Commit status:
[Not Reviewed]
References:
merge default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r110:0bd22936dfa6 - - 1 file changed: 6 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -19,16 +19,20
19 19
20 20 def initialize(dir_name, usage_filename='.usage_counter')
21 21 @dir_name = dir_name
22 22 @usage_filename = usage_filename
23 23 end
24 24
25 + def lock_filename
26 + return @dir_name + '/lockfile'
27 + end
28 +
25 29 # Check if someone has initialized the dir. If not, call block.
26 30
27 31 def setup # :yields: block
28 - dir = File.new(@dir_name + '/lockfile',"w+")
32 + dir = File.new(lock_filename,"w+")
29 33 dir.flock(File::LOCK_EX)
30 34 begin
31 35 counter_filename = get_counter_filename
32 36 if File.exist? counter_filename
33 37 # someone is here
34 38 f = File.new(counter_filename,"r+")
@@ -61,13 +65,13
61 65 end
62 66 end
63 67
64 68 # Check if I am the last one using the dir. If true, call block.
65 69
66 70 def teardown
67 - dir = File.new(@dir_name)
71 + dir = File.new(lock_filename)
68 72 dir.flock(File::LOCK_EX)
69 73 begin
70 74 counter_filename = get_counter_filename
71 75 if File.exist? counter_filename
72 76 # someone is here
73 77 f = File.new(counter_filename,"r+")
You need to be logged in to leave comments. Login now