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: 4 inserted, 2 deleted
@@ -158,103 +158,103 | |||
|
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 | + } | |
|
207 | + } | |
|
206 | 208 |
|
|
207 | 209 |
|
|
208 | 210 |
|
|
209 | 211 |
|
|
210 | 212 |
|
|
211 | - } | |
|
212 | - } | |
|
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 */ |
@@ -59,48 +59,50 | |||
|
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