Description:
fix bux when pid=0
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r157:b4e13c98cfec - - 2 files changed: 7 inserted, 5 deleted
@@ -110,199 +110,199 | |||
|
110 | 110 | static int partial_line; |
|
111 | 111 | |
|
112 | 112 | static int mem_peak_kb; |
|
113 | 113 | static int total_ms, wall_ms, sys_ms; |
|
114 | 114 | |
|
115 | 115 | static void die(char *msg, ...) NONRET; |
|
116 | 116 | static void sample_mem_peak(void); |
|
117 | 117 | |
|
118 | 118 | /*** Meta-files ***/ |
|
119 | 119 | |
|
120 | 120 | static FILE *metafile; |
|
121 | 121 | |
|
122 | 122 | static void |
|
123 | 123 | meta_open(const char *name) |
|
124 | 124 | { |
|
125 | 125 | if (!strcmp(name, "-")) |
|
126 | 126 | { |
|
127 | 127 | metafile = stdout; |
|
128 | 128 | return; |
|
129 | 129 | } |
|
130 | 130 | metafile = fopen(name, "w"); |
|
131 | 131 | if (!metafile) |
|
132 | 132 | die("Failed to open metafile '%s'",name); |
|
133 | 133 | } |
|
134 | 134 | |
|
135 | 135 | static void |
|
136 | 136 | meta_close(void) |
|
137 | 137 | { |
|
138 | 138 | if (metafile && metafile != stdout) |
|
139 | 139 | fclose(metafile); |
|
140 | 140 | } |
|
141 | 141 | |
|
142 | 142 | static void __attribute__((format(printf,1,2))) |
|
143 | 143 | meta_printf(const char *fmt, ...) |
|
144 | 144 | { |
|
145 | 145 | if (!metafile) |
|
146 | 146 | return; |
|
147 | 147 | |
|
148 | 148 | va_list args; |
|
149 | 149 | va_start(args, fmt); |
|
150 | 150 | vfprintf(metafile, fmt, args); |
|
151 | 151 | va_end(args); |
|
152 | 152 | } |
|
153 | 153 | |
|
154 | 154 | |
|
155 | 155 | static void print_running_stat(double wall_time, |
|
156 | 156 | double user_time, |
|
157 | 157 | double system_time, |
|
158 | 158 | int mem_usage) |
|
159 | 159 | { |
|
160 | 160 | //total is user |
|
161 | 161 | //wall is wall |
|
162 | 162 | // |
|
163 | 163 | fprintf(stderr,"%.4lfr%.4lfu%.4lfs%dm\n", |
|
164 | 164 | wall_time, user_time, system_time, mem_usage); |
|
165 | 165 | } |
|
166 | 166 | |
|
167 | 167 | static void |
|
168 | 168 | final_stats(struct rusage *rus) |
|
169 | 169 | { |
|
170 | 170 | struct timeval total, now, wall; |
|
171 | 171 | timeradd(&rus->ru_utime, &rus->ru_stime, &total); |
|
172 | 172 | total_ms = total.tv_sec*1000 + total.tv_usec/1000; |
|
173 | 173 | gettimeofday(&now, NULL); |
|
174 | 174 | timersub(&now, &start_time, &wall); |
|
175 | 175 | wall_ms = wall.tv_sec*1000 + wall.tv_usec/1000; |
|
176 | 176 | sys_ms = rus->ru_stime.tv_sec * 1000 + rus->ru_stime.tv_usec / 1000; |
|
177 | 177 | |
|
178 | 178 | meta_printf("time:%d.%03d\n", total_ms/1000, total_ms%1000); |
|
179 | 179 | meta_printf("time-wall:%d.%03d\n", wall_ms/1000, wall_ms%1000); |
|
180 | 180 | meta_printf("mem:%llu\n", (unsigned long long) mem_peak_kb * 1024); |
|
181 | 181 | } |
|
182 | 182 | |
|
183 | 183 | /*** Messages and exits ***/ |
|
184 | 184 | |
|
185 | 185 | static void NONRET |
|
186 | 186 | box_exit(int rc) |
|
187 | 187 | { |
|
188 | 188 | if (box_pid > 0) |
|
189 | 189 | { |
|
190 | 190 | sample_mem_peak(); |
|
191 | 191 | if (is_ptraced) |
|
192 | 192 | ptrace(PTRACE_KILL, box_pid); |
|
193 | 193 | kill(-box_pid, SIGKILL); |
|
194 | 194 | kill(box_pid, SIGKILL); |
|
195 | 195 | meta_printf("killed:1\n"); |
|
196 | 196 | |
|
197 | 197 | struct rusage rus; |
|
198 | 198 | int p, stat; |
|
199 | 199 | do |
|
200 | 200 | p = wait4(box_pid, &stat, 0, &rus); |
|
201 | 201 | while (p < 0 && errno == EINTR); |
|
202 | 202 | if (p < 0) |
|
203 | 203 | fprintf(stderr, "UGH: Lost track of the process (%m)\n"); |
|
204 | 204 | else { |
|
205 | 205 | final_stats(&rus); |
|
206 | - print_running_stat( | |
|
207 | - (double)wall_ms/1000, | |
|
208 | - (double)total_ms/1000, | |
|
209 | - (double)sys_ms/1000, | |
|
210 | - (mem_peak_kb + 1023) / 1024); | |
|
211 | 206 | } |
|
212 | 207 | } |
|
208 | + print_running_stat( | |
|
209 | + (double)wall_ms/1000, | |
|
210 | + (double)total_ms/1000, | |
|
211 | + (double)sys_ms/1000, | |
|
212 | + (mem_peak_kb + 1023) / 1024); | |
|
213 | 213 | meta_close(); |
|
214 | 214 | exit(rc); |
|
215 | 215 | } |
|
216 | 216 | |
|
217 | 217 | static void |
|
218 | 218 | flush_line(void) |
|
219 | 219 | { |
|
220 | 220 | if (partial_line) |
|
221 | 221 | fputc('\n', stderr); |
|
222 | 222 | partial_line = 0; |
|
223 | 223 | } |
|
224 | 224 | |
|
225 | 225 | /* Report an error of the sandbox itself */ |
|
226 | 226 | static void NONRET __attribute__((format(printf,1,2))) |
|
227 | 227 | die(char *msg, ...) |
|
228 | 228 | { |
|
229 | 229 | va_list args; |
|
230 | 230 | va_start(args, msg); |
|
231 | 231 | flush_line(); |
|
232 | 232 | char buf[1024]; |
|
233 | 233 | vsnprintf(buf, sizeof(buf), msg, args); |
|
234 | 234 | meta_printf("status:XX\nmessage:%s\n", buf); |
|
235 | 235 | fputs(buf, stderr); |
|
236 | 236 | fputc('\n', stderr); |
|
237 | 237 | box_exit(2); |
|
238 | 238 | } |
|
239 | 239 | |
|
240 | 240 | /* Report an error of the program inside the sandbox */ |
|
241 | 241 | static void NONRET __attribute__((format(printf,1,2))) |
|
242 | 242 | err(char *msg, ...) |
|
243 | 243 | { |
|
244 | 244 | va_list args; |
|
245 | 245 | va_start(args, msg); |
|
246 | 246 | flush_line(); |
|
247 | 247 | if (msg[0] && msg[1] && msg[2] == ':' && msg[3] == ' ') |
|
248 | 248 | { |
|
249 | 249 | meta_printf("status:%c%c\n", msg[0], msg[1]); |
|
250 | 250 | msg += 4; |
|
251 | 251 | } |
|
252 | 252 | char buf[1024]; |
|
253 | 253 | vsnprintf(buf, sizeof(buf), msg, args); |
|
254 | 254 | meta_printf("message:%s\n", buf); |
|
255 | 255 | fputs(buf, stderr); |
|
256 | 256 | fputc('\n', stderr); |
|
257 | 257 | box_exit(1); |
|
258 | 258 | } |
|
259 | 259 | |
|
260 | 260 | /* Write a message, but only if in verbose mode */ |
|
261 | 261 | static void __attribute__((format(printf,1,2))) |
|
262 | 262 | msg(char *msg, ...) |
|
263 | 263 | { |
|
264 | 264 | va_list args; |
|
265 | 265 | va_start(args, msg); |
|
266 | 266 | if (verbose) |
|
267 | 267 | { |
|
268 | 268 | int len = strlen(msg); |
|
269 | 269 | if (len > 0) |
|
270 | 270 | partial_line = (msg[len-1] != '\n'); |
|
271 | 271 | vfprintf(stderr, msg, args); |
|
272 | 272 | fflush(stderr); |
|
273 | 273 | } |
|
274 | 274 | va_end(args); |
|
275 | 275 | } |
|
276 | 276 | |
|
277 | 277 | static void * |
|
278 | 278 | xmalloc(size_t size) |
|
279 | 279 | { |
|
280 | 280 | void *p = malloc(size); |
|
281 | 281 | if (!p) |
|
282 | 282 | die("Out of memory"); |
|
283 | 283 | return p; |
|
284 | 284 | } |
|
285 | 285 | |
|
286 | 286 | /*** Syscall rules ***/ |
|
287 | 287 | |
|
288 | 288 | static const char * const syscall_names[] = { |
|
289 | 289 | |
|
290 | 290 | /* Syscall table automatically generated by mk-syscall-table */ |
|
291 | 291 | |
|
292 | 292 | /* 0 */ [ __NR_read ] = "read", |
|
293 | 293 | /* 1 */ [ __NR_write ] = "write", |
|
294 | 294 | /* 2 */ [ __NR_open ] = "open", |
|
295 | 295 | /* 3 */ [ __NR_close ] = "close", |
|
296 | 296 | /* 4 */ [ __NR_stat ] = "stat", |
|
297 | 297 | /* 5 */ [ __NR_fstat ] = "fstat", |
|
298 | 298 | /* 6 */ [ __NR_lstat ] = "lstat", |
|
299 | 299 | /* 7 */ [ __NR_poll ] = "poll", |
|
300 | 300 | /* 8 */ [ __NR_lseek ] = "lseek", |
|
301 | 301 | /* 9 */ [ __NR_mmap ] = "mmap", |
|
302 | 302 | /* 10 */ [ __NR_mprotect ] = "mprotect", |
|
303 | 303 | /* 11 */ [ __NR_munmap ] = "munmap", |
|
304 | 304 | /* 12 */ [ __NR_brk ] = "brk", |
|
305 | 305 | /* 13 */ [ __NR_rt_sigaction ] = "rt_sigaction", |
|
306 | 306 | /* 14 */ [ __NR_rt_sigprocmask ] = "rt_sigprocmask", |
|
307 | 307 | /* 15 */ [ __NR_rt_sigreturn ] = "rt_sigreturn", |
|
308 | 308 | /* 16 */ [ __NR_ioctl ] = "ioctl", |
@@ -11,96 +11,98 | |||
|
11 | 11 | end |
|
12 | 12 | if ENV['GRADER_LOGGING']!=nil |
|
13 | 13 | log_fname = ENV['GRADER_LOGGING'] |
|
14 | 14 | fp = File.open(log_fname,"a") |
|
15 | 15 | fp.puts("grade: #{Time.new.strftime("%H:%M")} #{str}") |
|
16 | 16 | fp.close |
|
17 | 17 | end |
|
18 | 18 | end |
|
19 | 19 | |
|
20 | 20 | def char_comment(comment) |
|
21 | 21 | if comment =~ /[Ii]ncorrect/ |
|
22 | 22 | INCORRECT_MARK |
|
23 | 23 | elsif comment =~ /[Cc]orrect/ |
|
24 | 24 | CORRECT_MARK |
|
25 | 25 | elsif comment =~ /[Tt]ime/ |
|
26 | 26 | TIMEOUT_MARK |
|
27 | 27 | elsif res = /^[Cc]omment:(.*)$/.match(comment) |
|
28 | 28 | res[1] |
|
29 | 29 | else |
|
30 | 30 | RUN_ERROR_MARK # these are run time errors |
|
31 | 31 | end |
|
32 | 32 | end |
|
33 | 33 | |
|
34 | 34 | problem_home = ENV['PROBLEM_HOME'] |
|
35 | 35 | require "#{problem_home}/script/test_dsl.rb" |
|
36 | 36 | load "#{problem_home}/test_cases/all_tests.cfg" |
|
37 | 37 | problem = Problem.get_instance |
|
38 | 38 | |
|
39 | 39 | if problem.well_formed? == false |
|
40 | 40 | log "The problem specification is not well formed." |
|
41 | 41 | exit(127) |
|
42 | 42 | end |
|
43 | 43 | |
|
44 | 44 | all_score = 0 |
|
45 | 45 | all_comment = '' |
|
46 | 46 | (1..(problem.runs.length-1)).each do |k| |
|
47 | 47 | log "grade run #{k}" |
|
48 | 48 | run = problem.runs[k] |
|
49 | 49 | run_score = nil |
|
50 | 50 | run_comment = '' |
|
51 | 51 | run_comment_short = '' |
|
52 | 52 | run.tests.each do |test_num| |
|
53 | 53 | result_file_name = "#{test_num}/result" |
|
54 | 54 | if not File.exists?(result_file_name) |
|
55 | 55 | run_comment += "result file for test #{test_num} not found\n" |
|
56 | 56 | run_comment_short += RUN_ERROR_MARK |
|
57 | 57 | log "Cannot find the file #{test_num}/result!" |
|
58 | 58 | else |
|
59 | 59 | result_file = File.new(result_file_name, "r") |
|
60 | 60 | result_file_lines = result_file.readlines |
|
61 | 61 | if result_file_lines.length>=2 |
|
62 | 62 | current_run_score = result_file_lines[1].to_i |
|
63 | 63 | run_comment += result_file_lines[0] |
|
64 | 64 | run_comment_short += char_comment(result_file_lines[0].chomp) |
|
65 | 65 | else |
|
66 | 66 | current_run_score = 0 |
|
67 | 67 | run_comment += "result file for test #{test_num} error\n" |
|
68 | 68 | run_comment_short += RUN_ERROR_MARK |
|
69 | 69 | log "Error in #{test_num}/result!" |
|
70 | 70 | end |
|
71 | 71 | |
|
72 | 72 | # the score of this run should be the minimum of the score for |
|
73 | 73 | # each test case |
|
74 | 74 | if (run_score==nil) or (run_score>current_run_score) |
|
75 | 75 | run_score = current_run_score |
|
76 | 76 | end |
|
77 | 77 | result_file.close |
|
78 | 78 | end |
|
79 | 79 | end |
|
80 | 80 | |
|
81 | 81 | run_result_file = File.new("result-#{k}", "w") |
|
82 | 82 | run_result_file.write run_score |
|
83 | 83 | run_result_file.write "\n" |
|
84 | 84 | run_result_file.close |
|
85 | 85 | |
|
86 | 86 | run_comment_file = File.new("comment-#{k}", "w") |
|
87 | 87 | run_comment_file.write "#{run_comment}\n" |
|
88 | 88 | run_comment_file.close |
|
89 | 89 | |
|
90 | 90 | all_score = all_score + run_score |
|
91 | 91 | |
|
92 | 92 | # append comment for test run with many test cases |
|
93 | 93 | if run.tests.length > 1 |
|
94 | 94 | run_comment_short = '[' + run_comment_short + ']' |
|
95 | 95 | end |
|
96 | 96 | all_comment += run_comment_short |
|
97 | 97 | end |
|
98 | 98 | |
|
99 | 99 | result_file = File.new("result", "w") |
|
100 | 100 | result_file.write all_score |
|
101 | 101 | result_file.write "\n" |
|
102 | 102 | result_file.close |
|
103 | 103 | |
|
104 | 104 | comment_file = File.new("comment", "w") |
|
105 | 105 | comment_file.write "#{all_comment}\n" |
|
106 | 106 | comment_file.close |
|
107 | + | |
|
108 | + log "score = #{all_score} comment = #{all_comment}" |
You need to be logged in to leave comments.
Login now