cafe-grader-judge-scripts

Commit r109:f75d1acc9cdd public

parent | child
Description:
fixed bug in dir_init teardown (wrong log filename)
Commit status:
[Not Reviewed]
References:
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

r109:f75d1acc9cdd - - 1 file changed: 6 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -13,28 +13,32
13 13 # directory. It locks the dir to manage critical section when
14 14 # updating the reference counter.
15 15
16 16 module DirInit
17 17
18 18 class Manager
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+")
35 39 counter = f.read.to_i
36 40 f.seek(0)
37 41 f.write("#{counter+1}\n")
38 42 f.close
39 43 else
40 44 # i'm the first, create the counter file
@@ -55,25 +59,25
55 59 raise
56 60
57 61 ensure
58 62 # make sure it unlock the directory
59 63 dir.flock(File::LOCK_UN)
60 64 dir.close
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+")
74 78 counter = f.read.to_i
75 79 f.seek(0)
76 80 f.write("#{counter-1}\n")
77 81 f.close
78 82
79 83 if counter == 1
You need to be logged in to leave comments. Login now