Description:
Merge pull request #3 from nattee/master
Quick fix for grader crash problem
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r195:3eff00360356 - - 3 files changed: 33 inserted, 31 deleted
@@ -169,275 +169,275 | |||||
|
169 | print "\n" |
|
169 | print "\n" |
|
170 | end |
|
170 | end |
|
171 | end |
|
171 | end |
|
172 | end |
|
172 | end |
|
173 |
|
173 | ||
|
174 | def grader_general_loop(engine, grader_proc, options) |
|
174 | def grader_general_loop(engine, grader_proc, options) |
|
175 | runner = Grader::Runner.new(engine, grader_proc) |
|
175 | runner = Grader::Runner.new(engine, grader_proc) |
|
176 | while true |
|
176 | while true |
|
177 |
|
177 | ||
|
178 | if check_stopfile # created by calling grader stop |
|
178 | if check_stopfile # created by calling grader stop |
|
179 | clear_stopfile |
|
179 | clear_stopfile |
|
180 | log "stopped (with stop file)" |
|
180 | log "stopped (with stop file)" |
|
181 | break |
|
181 | break |
|
182 | end |
|
182 | end |
|
183 |
|
183 | ||
|
184 | task = yield(runner) |
|
184 | task = yield(runner) |
|
185 |
|
185 | ||
|
186 | if task==nil |
|
186 | if task==nil |
|
187 | sleep(1) |
|
187 | sleep(1) |
|
188 | end |
|
188 | end |
|
189 | end |
|
189 | end |
|
190 | end |
|
190 | end |
|
191 |
|
191 | ||
|
192 | def grader_queue_loop(grader_proc, options) |
|
192 | def grader_queue_loop(grader_proc, options) |
|
193 | log "Grader: queue" |
|
193 | log "Grader: queue" |
|
194 | engine = Grader::Engine.new |
|
194 | engine = Grader::Engine.new |
|
195 | grader_general_loop(engine, grader_proc, options) do |runner| |
|
195 | grader_general_loop(engine, grader_proc, options) do |runner| |
|
196 | runner.grade_oldest_task |
|
196 | runner.grade_oldest_task |
|
197 | end |
|
197 | end |
|
198 | end |
|
198 | end |
|
199 |
|
199 | ||
|
200 | def grader_test_request_loop(grader_proc, options) |
|
200 | def grader_test_request_loop(grader_proc, options) |
|
201 | log "Grader: test_request" |
|
201 | log "Grader: test_request" |
|
202 | engine = Grader::Engine.new(:room_maker => Grader::TestRequestRoomMaker.new, |
|
202 | engine = Grader::Engine.new(:room_maker => Grader::TestRequestRoomMaker.new, |
|
203 | :reporter => Grader::TestRequestReporter.new) |
|
203 | :reporter => Grader::TestRequestReporter.new) |
|
204 | grader_general_loop(engine, grader_proc, options) do |runner| |
|
204 | grader_general_loop(engine, grader_proc, options) do |runner| |
|
205 | runner.grade_oldest_test_request |
|
205 | runner.grade_oldest_test_request |
|
206 | end |
|
206 | end |
|
207 | end |
|
207 | end |
|
208 |
|
208 | ||
|
209 | def grader_autonew_loop(grader_proc, options) |
|
209 | def grader_autonew_loop(grader_proc, options) |
|
210 | log "Grader: autonew" |
|
210 | log "Grader: autonew" |
|
211 |
|
211 | ||
|
212 | if options[:report] |
|
212 | if options[:report] |
|
213 | result_collector = ResultCollector.new |
|
213 | result_collector = ResultCollector.new |
|
214 | else |
|
214 | else |
|
215 | result_collector = nil |
|
215 | result_collector = nil |
|
216 | end |
|
216 | end |
|
217 |
|
217 | ||
|
218 | if options[:dry_run] |
|
218 | if options[:dry_run] |
|
219 | puts "Running in dry mode" |
|
219 | puts "Running in dry mode" |
|
220 | end |
|
220 | end |
|
221 |
|
221 | ||
|
222 | prob_reporter = Grader::SubmissionReporter.new(:dry_run => options[:dry_run], |
|
222 | prob_reporter = Grader::SubmissionReporter.new(:dry_run => options[:dry_run], |
|
223 | :result_collector => result_collector) |
|
223 | :result_collector => result_collector) |
|
224 |
|
224 | ||
|
225 | engine = Grader::Engine.new(:reporter => prob_reporter) |
|
225 | engine = Grader::Engine.new(:reporter => prob_reporter) |
|
226 | runner = Grader::Runner.new(engine, grader_proc) |
|
226 | runner = Grader::Runner.new(engine, grader_proc) |
|
227 |
|
227 | ||
|
228 | grader_proc.report_active if grader_proc!=nil |
|
228 | grader_proc.report_active if grader_proc!=nil |
|
229 |
|
229 | ||
|
230 | latest_submitted_at = nil |
|
230 | latest_submitted_at = nil |
|
231 | graded_submission_ids = {} |
|
231 | graded_submission_ids = {} |
|
232 |
|
232 | ||
|
233 | while true |
|
233 | while true |
|
234 |
|
234 | ||
|
235 | if check_stopfile # created by calling grader stop |
|
235 | if check_stopfile # created by calling grader stop |
|
236 | clear_stopfile |
|
236 | clear_stopfile |
|
237 | log "stopped (with stop file)" |
|
237 | log "stopped (with stop file)" |
|
238 | break |
|
238 | break |
|
239 | end |
|
239 | end |
|
240 |
|
240 | ||
|
241 | if latest_submitted_at==nil |
|
241 | if latest_submitted_at==nil |
|
242 | submissions = Submission.all |
|
242 | submissions = Submission.all |
|
243 | else |
|
243 | else |
|
244 | submissions = Submission.all(:conditions => ["submitted_at >= :latest", |
|
244 | submissions = Submission.all(:conditions => ["submitted_at >= :latest", |
|
245 | {:latest => latest_submitted_at}]) |
|
245 | {:latest => latest_submitted_at}]) |
|
246 | end |
|
246 | end |
|
247 |
|
247 | ||
|
248 | graded_any = false |
|
248 | graded_any = false |
|
249 |
|
249 | ||
|
250 | if submissions.length != 0 |
|
250 | if submissions.length != 0 |
|
251 | submissions.each do |submission| |
|
251 | submissions.each do |submission| |
|
252 | if (submission.problem == nil) or (!submission.problem.available) |
|
252 | if (submission.problem == nil) or (!submission.problem.available) |
|
253 | next |
|
253 | next |
|
254 | end |
|
254 | end |
|
255 | if ! graded_submission_ids[submission.id] |
|
255 | if ! graded_submission_ids[submission.id] |
|
256 | runner.grade_submission(submission) |
|
256 | runner.grade_submission(submission) |
|
257 | graded_submission_ids[submission.id] = true |
|
257 | graded_submission_ids[submission.id] = true |
|
258 | if (!latest_submitted_at or |
|
258 | if (!latest_submitted_at or |
|
259 | latest_submitted_at < submission.submitted_at) |
|
259 | latest_submitted_at < submission.submitted_at) |
|
260 | latest_submitted_at = submission.submitted_at |
|
260 | latest_submitted_at = submission.submitted_at |
|
261 | end |
|
261 | end |
|
262 | puts "graded: #{submission.id}" |
|
262 | puts "graded: #{submission.id}" |
|
263 | puts "latest: #{latest_submitted_at}" |
|
263 | puts "latest: #{latest_submitted_at}" |
|
264 | graded_any = true |
|
264 | graded_any = true |
|
265 | end |
|
265 | end |
|
266 | end |
|
266 | end |
|
267 | end |
|
267 | end |
|
268 |
|
268 | ||
|
269 | if ! graded_any |
|
269 | if ! graded_any |
|
270 | sleep(1) |
|
270 | sleep(1) |
|
271 | end |
|
271 | end |
|
272 | end |
|
272 | end |
|
273 | end |
|
273 | end |
|
274 |
|
274 | ||
|
275 | def grader_grade_problems(grader_proc, options) |
|
275 | def grader_grade_problems(grader_proc, options) |
|
276 | if options[:report] |
|
276 | if options[:report] |
|
277 | result_collector = ResultCollector.new |
|
277 | result_collector = ResultCollector.new |
|
278 | else |
|
278 | else |
|
279 | result_collector = nil |
|
279 | result_collector = nil |
|
280 | end |
|
280 | end |
|
281 |
|
281 | ||
|
282 | if options[:dry_run] |
|
282 | if options[:dry_run] |
|
283 | puts "Running in dry mode" |
|
283 | puts "Running in dry mode" |
|
284 | end |
|
284 | end |
|
285 |
|
285 | ||
|
286 | prob_reporter = Grader::SubmissionReporter.new(:dry_run => options[:dry_run], |
|
286 | prob_reporter = Grader::SubmissionReporter.new(:dry_run => options[:dry_run], |
|
287 | :result_collector => result_collector) |
|
287 | :result_collector => result_collector) |
|
288 | engine = Grader::Engine.new(:reporter => prob_reporter) |
|
288 | engine = Grader::Engine.new(:reporter => prob_reporter) |
|
289 | runner = Grader::Runner.new(engine, grader_proc) |
|
289 | runner = Grader::Runner.new(engine, grader_proc) |
|
290 |
|
290 | ||
|
291 | grader_proc.report_active if grader_proc!=nil |
|
291 | grader_proc.report_active if grader_proc!=nil |
|
292 |
|
292 | ||
|
293 | ARGV.each do |prob_name| |
|
293 | ARGV.each do |prob_name| |
|
294 | prob = Problem.find_by_name(prob_name) |
|
294 | prob = Problem.find_by_name(prob_name) |
|
295 | if prob==nil |
|
295 | if prob==nil |
|
296 | puts "cannot find problem: #{prob_name}" |
|
296 | puts "cannot find problem: #{prob_name}" |
|
297 | else |
|
297 | else |
|
298 | runner.grade_problem(prob) |
|
298 | runner.grade_problem(prob) |
|
299 | end |
|
299 | end |
|
300 | end |
|
300 | end |
|
301 |
|
301 | ||
|
302 | if options[:report] |
|
302 | if options[:report] |
|
303 | result_collector.print_report_by_user |
|
303 | result_collector.print_report_by_user |
|
304 | end |
|
304 | end |
|
305 | end |
|
305 | end |
|
306 |
|
306 | ||
|
307 | def grader_grade_contests(grader_proc, options) |
|
307 | def grader_grade_contests(grader_proc, options) |
|
308 | # always use dry run when grading during contest |
|
308 | # always use dry run when grading during contest |
|
309 | dry_run = options[:dry_run] = true |
|
309 | dry_run = options[:dry_run] = true |
|
310 |
|
310 | ||
|
311 | contest_name = ARGV.shift |
|
311 | contest_name = ARGV.shift |
|
312 |
|
312 | ||
|
313 | contest = Contest.find_by_name(contest_name) |
|
313 | contest = Contest.find_by_name(contest_name) |
|
314 | if contest==nil |
|
314 | if contest==nil |
|
315 | puts "cannot find contest: #{contest_name}" |
|
315 | puts "cannot find contest: #{contest_name}" |
|
316 | exit(0) |
|
316 | exit(0) |
|
317 | end |
|
317 | end |
|
318 |
|
318 | ||
|
319 | if options[:report] |
|
319 | if options[:report] |
|
320 | result_collector = ResultCollector.new |
|
320 | result_collector = ResultCollector.new |
|
321 | else |
|
321 | else |
|
322 | result_collector = nil |
|
322 | result_collector = nil |
|
323 | end |
|
323 | end |
|
324 |
|
324 | ||
|
325 | if options[:dry_run] |
|
325 | if options[:dry_run] |
|
326 | puts "Running in dry mode" |
|
326 | puts "Running in dry mode" |
|
327 | end |
|
327 | end |
|
328 |
|
328 | ||
|
329 | prob_reporter = Grader::SubmissionReporter.new(:dry_run => dry_run, |
|
329 | prob_reporter = Grader::SubmissionReporter.new(:dry_run => dry_run, |
|
330 | :result_collector => result_collector) |
|
330 | :result_collector => result_collector) |
|
331 | engine = Grader::Engine.new(:reporter => prob_reporter) |
|
331 | engine = Grader::Engine.new(:reporter => prob_reporter) |
|
332 | runner = Grader::Runner.new(engine, grader_proc) |
|
332 | runner = Grader::Runner.new(engine, grader_proc) |
|
333 |
|
333 | ||
|
334 | grader_proc.report_active if grader_proc!=nil |
|
334 | grader_proc.report_active if grader_proc!=nil |
|
335 |
|
335 | ||
|
336 | contest.problems.each do |problem| |
|
336 | contest.problems.each do |problem| |
|
337 | puts "Grading: #{problem.name}" |
|
337 | puts "Grading: #{problem.name}" |
|
338 | runner.grade_problem(problem, |
|
338 | runner.grade_problem(problem, |
|
339 | :user_conditions => lambda do |u| |
|
339 | :user_conditions => lambda do |u| |
|
340 | u.contest_finished? and |
|
340 | u.contest_finished? and |
|
341 | u.contest_ids.include?(contest.id) |
|
341 | u.contest_ids.include?(contest.id) |
|
342 | end) |
|
342 | end) |
|
343 | end |
|
343 | end |
|
344 |
|
344 | ||
|
345 | if options[:report] |
|
345 | if options[:report] |
|
346 | result_collector.print_report_by_user |
|
346 | result_collector.print_report_by_user |
|
347 | end |
|
347 | end |
|
348 | end |
|
348 | end |
|
349 |
|
349 | ||
|
350 | def grader_grade_submissions(grader_proc, options) |
|
350 | def grader_grade_submissions(grader_proc, options) |
|
351 | engine = Grader::Engine.new |
|
351 | engine = Grader::Engine.new |
|
352 | runner = Grader::Runner.new(engine, grader_proc) |
|
352 | runner = Grader::Runner.new(engine, grader_proc) |
|
353 |
|
353 | ||
|
354 | grader_proc.report_active if grader_proc!=nil |
|
354 | grader_proc.report_active if grader_proc!=nil |
|
355 |
|
355 | ||
|
356 | ARGV.each do |sub_id| |
|
356 | ARGV.each do |sub_id| |
|
357 | puts "Grading #{sub_id}" |
|
357 | puts "Grading #{sub_id}" |
|
358 | begin |
|
358 | begin |
|
359 | submission = Submission.find(sub_id.to_i) |
|
359 | submission = Submission.find(sub_id.to_i) |
|
360 | rescue ActiveRecord::RecordNotFound |
|
360 | rescue ActiveRecord::RecordNotFound |
|
361 |
- puts " |
|
361 | + puts "Submission #{sub_id} not found" |
|
362 | submission = nil |
|
362 | submission = nil |
|
363 | end |
|
363 | end |
|
364 |
|
364 | ||
|
365 | if submission!=nil |
|
365 | if submission!=nil |
|
366 | runner.grade_submission(submission) |
|
366 | runner.grade_submission(submission) |
|
367 | end |
|
367 | end |
|
368 | end |
|
368 | end |
|
369 | end |
|
369 | end |
|
370 |
|
370 | ||
|
371 | ######################################### |
|
371 | ######################################### |
|
372 | # main program |
|
372 | # main program |
|
373 | ######################################### |
|
373 | ######################################### |
|
374 |
|
374 | ||
|
375 | options = process_options_and_stop_file |
|
375 | options = process_options_and_stop_file |
|
376 | GRADER_ENV = options[:environment] |
|
376 | GRADER_ENV = options[:environment] |
|
377 | grader_mode = options[:mode] |
|
377 | grader_mode = options[:mode] |
|
378 | dry_run = options[:dry_run] |
|
378 | dry_run = options[:dry_run] |
|
379 |
|
379 | ||
|
380 | puts "environment: #{GRADER_ENV}" |
|
380 | puts "environment: #{GRADER_ENV}" |
|
381 | require File.join(File.dirname(__FILE__),'config/environment') |
|
381 | require File.join(File.dirname(__FILE__),'config/environment') |
|
382 |
|
382 | ||
|
383 | # add grader_mode to config |
|
383 | # add grader_mode to config |
|
384 | # this is needed because method log needs it. TODO: clean this up |
|
384 | # this is needed because method log needs it. TODO: clean this up |
|
385 | class << config |
|
385 | class << config |
|
386 | attr_accessor :grader_mode |
|
386 | attr_accessor :grader_mode |
|
387 | end |
|
387 | end |
|
388 | config.grader_mode = grader_mode |
|
388 | config.grader_mode = grader_mode |
|
389 |
|
389 | ||
|
390 | # reading rails environment |
|
390 | # reading rails environment |
|
391 | log 'Reading rails environment' |
|
391 | log 'Reading rails environment' |
|
392 |
|
392 | ||
|
393 | RAILS_ENV = config.rails_env |
|
393 | RAILS_ENV = config.rails_env |
|
394 | require RAILS_ROOT + '/config/environment' |
|
394 | require RAILS_ROOT + '/config/environment' |
|
395 |
|
395 | ||
|
396 | # register grader process |
|
396 | # register grader process |
|
397 | if config.report_grader |
|
397 | if config.report_grader |
|
398 | grader_proc = GraderProcess.register(config.grader_hostname, |
|
398 | grader_proc = GraderProcess.register(config.grader_hostname, |
|
399 | Process.pid, |
|
399 | Process.pid, |
|
400 | grader_mode) |
|
400 | grader_mode) |
|
401 | else |
|
401 | else |
|
402 | grader_proc = nil |
|
402 | grader_proc = nil |
|
403 | end |
|
403 | end |
|
404 |
|
404 | ||
|
405 | #set loggin environment |
|
405 | #set loggin environment |
|
406 | ENV['GRADER_LOGGING'] = log_file_name |
|
406 | ENV['GRADER_LOGGING'] = log_file_name |
|
407 |
|
407 | ||
|
408 | # register exit handler to report inactive, and terminated |
|
408 | # register exit handler to report inactive, and terminated |
|
409 | at_exit do |
|
409 | at_exit do |
|
410 | if grader_proc!=nil |
|
410 | if grader_proc!=nil |
|
411 | grader_proc.report_inactive |
|
411 | grader_proc.report_inactive |
|
412 | grader_proc.terminate |
|
412 | grader_proc.terminate |
|
413 | end |
|
413 | end |
|
414 | end |
|
414 | end |
|
415 |
|
415 | ||
|
416 | # |
|
416 | # |
|
417 | # MAIN LOOP |
|
417 | # MAIN LOOP |
|
418 | # |
|
418 | # |
|
419 |
|
419 | ||
|
420 | case grader_mode |
|
420 | case grader_mode |
|
421 | when "queue" |
|
421 | when "queue" |
|
422 | grader_queue_loop(grader_proc, options) |
|
422 | grader_queue_loop(grader_proc, options) |
|
423 |
|
423 | ||
|
424 | when "test_request" |
|
424 | when "test_request" |
|
425 | grader_test_request_loop(grader_proc, options) |
|
425 | grader_test_request_loop(grader_proc, options) |
|
426 |
|
426 | ||
|
427 | when "prob" |
|
427 | when "prob" |
|
428 | grader_grade_problems(grader_proc, options) |
|
428 | grader_grade_problems(grader_proc, options) |
|
429 |
|
429 | ||
|
430 | when "contest" |
|
430 | when "contest" |
|
431 | grader_grade_contests(grader_proc, options) |
|
431 | grader_grade_contests(grader_proc, options) |
|
432 |
|
432 | ||
|
433 | when "sub" |
|
433 | when "sub" |
|
434 | grader_grade_submissions(grader_proc, options) |
|
434 | grader_grade_submissions(grader_proc, options) |
|
435 |
|
435 | ||
|
436 | when "autonew" |
|
436 | when "autonew" |
|
437 | grader_autonew_loop(grader_proc, options) |
|
437 | grader_autonew_loop(grader_proc, options) |
|
438 |
|
438 | ||
|
439 | else |
|
439 | else |
|
440 | display_manual |
|
440 | display_manual |
|
441 | exit(0) |
|
441 | exit(0) |
|
442 | end |
|
442 | end |
|
443 |
|
443 |
@@ -1,188 +1,190 | |||||
|
1 | require 'fileutils' |
|
1 | require 'fileutils' |
|
2 | require File.join(File.dirname(__FILE__),'dir_init') |
|
2 | require File.join(File.dirname(__FILE__),'dir_init') |
|
3 |
|
3 | ||
|
4 | module Grader |
|
4 | module Grader |
|
5 |
|
5 | ||
|
6 | # |
|
6 | # |
|
7 | # A grader engine grades a submission, against anything: a test |
|
7 | # A grader engine grades a submission, against anything: a test |
|
8 | # data, or a user submitted test data. It uses two helpers objects: |
|
8 | # data, or a user submitted test data. It uses two helpers objects: |
|
9 | # room_maker and reporter. |
|
9 | # room_maker and reporter. |
|
10 | # |
|
10 | # |
|
11 | class Engine |
|
11 | class Engine |
|
12 |
|
12 | ||
|
13 | attr_writer :room_maker |
|
13 | attr_writer :room_maker |
|
14 | attr_writer :reporter |
|
14 | attr_writer :reporter |
|
15 |
|
15 | ||
|
16 | def initialize(options={}) |
|
16 | def initialize(options={}) |
|
17 | # default options |
|
17 | # default options |
|
18 | if not options.include? :room_maker |
|
18 | if not options.include? :room_maker |
|
19 | options[:room_maker] = Grader::SubmissionRoomMaker.new |
|
19 | options[:room_maker] = Grader::SubmissionRoomMaker.new |
|
20 | end |
|
20 | end |
|
21 | if not options.include? :reporter |
|
21 | if not options.include? :reporter |
|
22 | options[:reporter] = Grader::SubmissionReporter.new |
|
22 | options[:reporter] = Grader::SubmissionReporter.new |
|
23 | end |
|
23 | end |
|
24 |
|
24 | ||
|
25 | @config = Grader::Configuration.get_instance |
|
25 | @config = Grader::Configuration.get_instance |
|
26 |
|
26 | ||
|
27 | @room_maker = options[:room_maker] |
|
27 | @room_maker = options[:room_maker] |
|
28 | @reporter = options[:reporter] |
|
28 | @reporter = options[:reporter] |
|
29 | end |
|
29 | end |
|
30 |
|
30 | ||
|
31 | # takes a submission, asks room_maker to produce grading directories, |
|
31 | # takes a submission, asks room_maker to produce grading directories, |
|
32 | # calls grader scripts, and asks reporter to save the result |
|
32 | # calls grader scripts, and asks reporter to save the result |
|
33 | def grade(submission) |
|
33 | def grade(submission) |
|
34 | current_dir = FileUtils.pwd |
|
34 | current_dir = FileUtils.pwd |
|
35 |
|
35 | ||
|
36 | user = submission.user |
|
36 | user = submission.user |
|
37 | problem = submission.problem |
|
37 | problem = submission.problem |
|
38 |
|
38 | ||
|
39 | - # TODO: will have to create real exception for this |
|
39 | + begin |
|
40 | - if user==nil or problem == nil |
|
40 | + # TODO: will have to create real exception for this |
|
41 | - @reporter.report_error(submission,"Grading error: problem with submission") |
|
41 | + if user==nil or problem == nil |
|
42 | - #raise "engine: user or problem is nil" |
|
42 | + @reporter.report_error(submission,"Grading error: problem with submission") |
|
43 | - end |
|
43 | + raise "engine: user or problem is nil" |
|
44 | - |
|
44 | + end |
|
45 | - # TODO: this is another hack so that output only task can be judged |
|
||
|
46 | - if submission.language!=nil |
|
||
|
47 | - language = submission.language.name |
|
||
|
48 | - lang_ext = submission.language.ext |
|
||
|
49 | - else |
|
||
|
50 | - language = 'c' |
|
||
|
51 | - lang_ext = 'c' |
|
||
|
52 | - end |
|
||
|
53 |
|
45 | ||
|
54 | - # This is needed because older version of std-scripts/compile |
|
46 | + # TODO: this is another hack so that output only task can be judged |
|
55 | - # only look for c++. |
|
47 | + if submission.language!=nil |
|
56 | - if language == 'cpp' |
|
48 | + language = submission.language.name |
|
57 | - language = 'c++' |
|
49 | + lang_ext = submission.language.ext |
|
58 |
- |
|
50 | + else |
|
|
51 | + language = 'c' | ||
|
|
52 | + lang_ext = 'c' | ||
|
|
53 | + end | ||
|
59 |
|
54 | ||
|
60 | - # COMMENT: should it be only source.ext? |
|
55 | + # This is needed because older version of std-scripts/compile |
|
61 | - if problem!=nil |
|
56 | + # only look for c++. |
|
62 | - source_name = "#{problem.name}.#{lang_ext}" |
|
57 | + if language == 'cpp' |
|
63 | - else |
|
58 | + language = 'c++' |
|
64 | - source_name = "source.#{lang_ext}" |
|
59 | + end |
|
65 | - end |
|
||
|
66 |
|
60 | ||
|
67 | - begin |
|
61 | + # COMMENT: should it be only source.ext? |
|
|
62 | + if problem!=nil | ||
|
|
63 | + source_name = "#{problem.name}.#{lang_ext}" | ||
|
|
64 | + else | ||
|
|
65 | + source_name = "source.#{lang_ext}" | ||
|
|
66 | + end | ||
|
|
67 | + | ||
|
68 | grading_dir = @room_maker.produce_grading_room(submission) |
|
68 | grading_dir = @room_maker.produce_grading_room(submission) |
|
69 | @room_maker.save_source(submission,source_name) |
|
69 | @room_maker.save_source(submission,source_name) |
|
70 | problem_home = @room_maker.find_problem_home(submission) |
|
70 | problem_home = @room_maker.find_problem_home(submission) |
|
71 |
|
71 | ||
|
72 | # puts "GRADING DIR: #{grading_dir}" |
|
72 | # puts "GRADING DIR: #{grading_dir}" |
|
73 | # puts "PROBLEM DIR: #{problem_home}" |
|
73 | # puts "PROBLEM DIR: #{problem_home}" |
|
74 |
|
74 | ||
|
75 | if !FileTest.exist?(problem_home) |
|
75 | if !FileTest.exist?(problem_home) |
|
76 | - raise "No test data." |
|
76 | + puts "PROBLEM DIR: #{problem_home}" |
|
|
77 | + raise "engine: No test data." | ||
|
77 | end |
|
78 | end |
|
78 |
|
79 | ||
|
79 | dinit = DirInit::Manager.new(problem_home) |
|
80 | dinit = DirInit::Manager.new(problem_home) |
|
80 |
|
81 | ||
|
81 | dinit.setup do |
|
82 | dinit.setup do |
|
82 | copy_log = copy_script(problem_home) |
|
83 | copy_log = copy_script(problem_home) |
|
83 | save_copy_log(problem_home,copy_log) |
|
84 | save_copy_log(problem_home,copy_log) |
|
84 | end |
|
85 | end |
|
85 |
|
86 | ||
|
86 | call_judge(problem_home,language,grading_dir,source_name) |
|
87 | call_judge(problem_home,language,grading_dir,source_name) |
|
87 |
|
88 | ||
|
88 | @reporter.report(submission,"#{grading_dir}/test-result") |
|
89 | @reporter.report(submission,"#{grading_dir}/test-result") |
|
89 |
|
90 | ||
|
90 | dinit.teardown do |
|
91 | dinit.teardown do |
|
91 | copy_log = load_copy_log(problem_home) |
|
92 | copy_log = load_copy_log(problem_home) |
|
92 | clear_copy_log(problem_home) |
|
93 | clear_copy_log(problem_home) |
|
93 | clear_script(copy_log,problem_home) |
|
94 | clear_script(copy_log,problem_home) |
|
94 | end |
|
95 | end |
|
95 |
|
96 | ||
|
96 | rescue RuntimeError => msg |
|
97 | rescue RuntimeError => msg |
|
97 | @reporter.report_error(submission, msg) |
|
98 | @reporter.report_error(submission, msg) |
|
|
99 | + puts "ERROR: #{msg}" | ||
|
98 |
|
100 | ||
|
99 | ensure |
|
101 | ensure |
|
100 | @room_maker.clean_up(submission) |
|
102 | @room_maker.clean_up(submission) |
|
101 | Dir.chdir(current_dir) # this is really important |
|
103 | Dir.chdir(current_dir) # this is really important |
|
102 | end |
|
104 | end |
|
103 | end |
|
105 | end |
|
104 |
|
106 | ||
|
105 | protected |
|
107 | protected |
|
106 |
|
108 | ||
|
107 | def talk(str) |
|
109 | def talk(str) |
|
108 | if @config.talkative |
|
110 | if @config.talkative |
|
109 | puts str |
|
111 | puts str |
|
110 | end |
|
112 | end |
|
111 | end |
|
113 | end |
|
112 |
|
114 | ||
|
113 | def call_judge(problem_home,language,grading_dir,fname) |
|
115 | def call_judge(problem_home,language,grading_dir,fname) |
|
114 | ENV['PROBLEM_HOME'] = problem_home |
|
116 | ENV['PROBLEM_HOME'] = problem_home |
|
115 | ENV['RUBYOPT'] = '' |
|
117 | ENV['RUBYOPT'] = '' |
|
116 |
|
118 | ||
|
117 | talk grading_dir |
|
119 | talk grading_dir |
|
118 | Dir.chdir grading_dir |
|
120 | Dir.chdir grading_dir |
|
119 | cmd = "#{problem_home}/script/judge #{language} #{fname}" |
|
121 | cmd = "#{problem_home}/script/judge #{language} #{fname}" |
|
120 | talk "CMD: #{cmd}" |
|
122 | talk "CMD: #{cmd}" |
|
121 | system(cmd) |
|
123 | system(cmd) |
|
122 | end |
|
124 | end |
|
123 |
|
125 | ||
|
124 | def get_std_script_dir |
|
126 | def get_std_script_dir |
|
125 | GRADER_ROOT + '/std-script' |
|
127 | GRADER_ROOT + '/std-script' |
|
126 | end |
|
128 | end |
|
127 |
|
129 | ||
|
128 | def copy_script(problem_home) |
|
130 | def copy_script(problem_home) |
|
129 | script_dir = "#{problem_home}/script" |
|
131 | script_dir = "#{problem_home}/script" |
|
130 | std_script_dir = get_std_script_dir |
|
132 | std_script_dir = get_std_script_dir |
|
131 |
|
133 | ||
|
132 | - raise "std-script directory not found" if !FileTest.exist?(std_script_dir) |
|
134 | + raise "engine: std-script directory not found" if !FileTest.exist?(std_script_dir) |
|
133 |
|
135 | ||
|
134 | scripts = Dir[std_script_dir + '/*'] |
|
136 | scripts = Dir[std_script_dir + '/*'] |
|
135 |
|
137 | ||
|
136 | copied = [] |
|
138 | copied = [] |
|
137 |
|
139 | ||
|
138 | scripts.each do |s| |
|
140 | scripts.each do |s| |
|
139 | fname = File.basename(s) |
|
141 | fname = File.basename(s) |
|
140 | next if FileTest.directory?(s) |
|
142 | next if FileTest.directory?(s) |
|
141 | if !FileTest.exist?("#{script_dir}/#{fname}") |
|
143 | if !FileTest.exist?("#{script_dir}/#{fname}") |
|
142 | copied << fname |
|
144 | copied << fname |
|
143 | FileUtils.cp(s, "#{script_dir}", :preserve => true) |
|
145 | FileUtils.cp(s, "#{script_dir}", :preserve => true) |
|
144 | end |
|
146 | end |
|
145 | end |
|
147 | end |
|
146 |
|
148 | ||
|
147 | return copied |
|
149 | return copied |
|
148 | end |
|
150 | end |
|
149 |
|
151 | ||
|
150 | def copy_log_filename(problem_home) |
|
152 | def copy_log_filename(problem_home) |
|
151 | return File.join(problem_home, '.scripts_copied') |
|
153 | return File.join(problem_home, '.scripts_copied') |
|
152 | end |
|
154 | end |
|
153 |
|
155 | ||
|
154 | def save_copy_log(problem_home, log) |
|
156 | def save_copy_log(problem_home, log) |
|
155 | f = File.new(copy_log_filename(problem_home),"w") |
|
157 | f = File.new(copy_log_filename(problem_home),"w") |
|
156 | log.each do |fname| |
|
158 | log.each do |fname| |
|
157 | f.write("#{fname}\n") |
|
159 | f.write("#{fname}\n") |
|
158 | end |
|
160 | end |
|
159 | f.close |
|
161 | f.close |
|
160 | end |
|
162 | end |
|
161 |
|
163 | ||
|
162 | def load_copy_log(problem_home) |
|
164 | def load_copy_log(problem_home) |
|
163 | f = File.new(copy_log_filename(problem_home),"r") |
|
165 | f = File.new(copy_log_filename(problem_home),"r") |
|
164 | log = [] |
|
166 | log = [] |
|
165 | f.readlines.each do |line| |
|
167 | f.readlines.each do |line| |
|
166 | log << line.strip |
|
168 | log << line.strip |
|
167 | end |
|
169 | end |
|
168 | f.close |
|
170 | f.close |
|
169 | log |
|
171 | log |
|
170 | end |
|
172 | end |
|
171 |
|
173 | ||
|
172 | def clear_copy_log(problem_home) |
|
174 | def clear_copy_log(problem_home) |
|
173 | File.delete(copy_log_filename(problem_home)) |
|
175 | File.delete(copy_log_filename(problem_home)) |
|
174 | end |
|
176 | end |
|
175 |
|
177 | ||
|
176 | def clear_script(log,problem_home) |
|
178 | def clear_script(log,problem_home) |
|
177 | log.each do |s| |
|
179 | log.each do |s| |
|
178 | FileUtils.rm("#{problem_home}/script/#{s}") |
|
180 | FileUtils.rm("#{problem_home}/script/#{s}") |
|
179 | end |
|
181 | end |
|
180 | end |
|
182 | end |
|
181 |
|
183 | ||
|
182 | def mkdir_if_does_not_exist(dirname) |
|
184 | def mkdir_if_does_not_exist(dirname) |
|
183 | Dir.mkdir(dirname) if !FileTest.exist?(dirname) |
|
185 | Dir.mkdir(dirname) if !FileTest.exist?(dirname) |
|
184 | end |
|
186 | end |
|
185 |
|
187 | ||
|
186 | end |
|
188 | end |
|
187 |
|
189 | ||
|
188 | end |
|
190 | end |
@@ -1,113 +1,113 | |||||
|
1 | #!/usr/bin/env ruby |
|
1 | #!/usr/bin/env ruby |
|
2 |
|
2 | ||
|
3 | require 'fileutils' |
|
3 | require 'fileutils' |
|
4 |
|
4 | ||
|
5 | ############################## |
|
5 | ############################## |
|
6 | # |
|
6 | # |
|
7 | # Standard Compile Script |
|
7 | # Standard Compile Script |
|
8 | # |
|
8 | # |
|
9 | # Supported compilers: |
|
9 | # Supported compilers: |
|
10 | # gcc, g++, and fpc. |
|
10 | # gcc, g++, and fpc. |
|
11 | # |
|
11 | # |
|
12 | ############################## |
|
12 | ############################## |
|
13 |
|
13 | ||
|
14 |
- def talk( |
|
14 | + def talk(str='') |
|
15 | if ENV['TALKATIVE']!=nil |
|
15 | if ENV['TALKATIVE']!=nil |
|
16 | puts str |
|
16 | puts str |
|
17 | end |
|
17 | end |
|
18 | if ENV['GRADER_LOGGING']!=nil |
|
18 | if ENV['GRADER_LOGGING']!=nil |
|
19 | log_fname = ENV['GRADER_LOGGING'] |
|
19 | log_fname = ENV['GRADER_LOGGING'] |
|
20 | fp = File.open(log_fname,"a") |
|
20 | fp = File.open(log_fname,"a") |
|
21 |
- fp.puts("run: #{Time.new.strftime("%H:%M")} #{ |
|
21 | + fp.puts("run: #{Time.new.strftime("%H:%M")} #{str}") |
|
22 | fp.close |
|
22 | fp.close |
|
23 | end |
|
23 | end |
|
24 | end |
|
24 | end |
|
25 |
|
25 | ||
|
26 | C_COMPILER = "/usr/bin/gcc" |
|
26 | C_COMPILER = "/usr/bin/gcc" |
|
27 | CPLUSPLUS_COMPILER = "/usr/bin/g++" |
|
27 | CPLUSPLUS_COMPILER = "/usr/bin/g++" |
|
28 | PASCAL_COMPILER = "/usr/bin/fpc" |
|
28 | PASCAL_COMPILER = "/usr/bin/fpc" |
|
29 |
|
29 | ||
|
30 | C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall" |
|
30 | C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall" |
|
31 | CPLUSPLUS_OPTIONS = "-O2 -s -static -DCONTEST -lm -Wall" |
|
31 | CPLUSPLUS_OPTIONS = "-O2 -s -static -DCONTEST -lm -Wall" |
|
32 | PASCAL_OPTIONS = "-O1 -XS -dCONTEST" |
|
32 | PASCAL_OPTIONS = "-O1 -XS -dCONTEST" |
|
33 |
|
33 | ||
|
34 | # Check for the correct number of arguments. Otherwise, print usage. |
|
34 | # Check for the correct number of arguments. Otherwise, print usage. |
|
35 | if ARGV.length == 0 or ARGV.length > 4 |
|
35 | if ARGV.length == 0 or ARGV.length > 4 |
|
36 | puts "Usage: compile <language> [<source-file>] [<output-file>] [<message-file>]" |
|
36 | puts "Usage: compile <language> [<source-file>] [<output-file>] [<message-file>]" |
|
37 | puts |
|
37 | puts |
|
38 | puts "<source-file> is defaulted to \"source\"." |
|
38 | puts "<source-file> is defaulted to \"source\"." |
|
39 | puts "<output-file> is defaulted to \"a.out\"." |
|
39 | puts "<output-file> is defaulted to \"a.out\"." |
|
40 | puts "<message-file> is defaulted to \"compiler_message\"." |
|
40 | puts "<message-file> is defaulted to \"compiler_message\"." |
|
41 | puts |
|
41 | puts |
|
42 | exit(127) |
|
42 | exit(127) |
|
43 | end |
|
43 | end |
|
44 |
|
44 | ||
|
45 | PARAMS = { |
|
45 | PARAMS = { |
|
46 | :source_file => [1,'source'], |
|
46 | :source_file => [1,'source'], |
|
47 | :output_file => [2,'a.out'], |
|
47 | :output_file => [2,'a.out'], |
|
48 | :message_file => [3,'compiler_message'] |
|
48 | :message_file => [3,'compiler_message'] |
|
49 | } |
|
49 | } |
|
50 |
|
50 | ||
|
51 | params = {} |
|
51 | params = {} |
|
52 | params[:prog_lang] = ARGV[0] |
|
52 | params[:prog_lang] = ARGV[0] |
|
53 | PARAMS.each_key do |param_name| |
|
53 | PARAMS.each_key do |param_name| |
|
54 | index, default = PARAMS[param_name] |
|
54 | index, default = PARAMS[param_name] |
|
55 | if ARGV.length > index |
|
55 | if ARGV.length > index |
|
56 | params[param_name] = ARGV[index] |
|
56 | params[param_name] = ARGV[index] |
|
57 | else |
|
57 | else |
|
58 | params[param_name] = default |
|
58 | params[param_name] = default |
|
59 | end |
|
59 | end |
|
60 | talk "#{param_name}: #{params[param_name]}" |
|
60 | talk "#{param_name}: #{params[param_name]}" |
|
61 | end |
|
61 | end |
|
62 |
|
62 | ||
|
63 | # Remove any remaining output files or message files. |
|
63 | # Remove any remaining output files or message files. |
|
64 | if FileTest.exists? params[:output_file] |
|
64 | if FileTest.exists? params[:output_file] |
|
65 | FileUtils.rm(params[:output_file]) |
|
65 | FileUtils.rm(params[:output_file]) |
|
66 | end |
|
66 | end |
|
67 | if FileTest.exists? params[:message_file] |
|
67 | if FileTest.exists? params[:message_file] |
|
68 | FileUtils.rm(params[:message_file]) |
|
68 | FileUtils.rm(params[:message_file]) |
|
69 | end |
|
69 | end |
|
70 |
|
70 | ||
|
71 | # Check if the source file exists before attempt compiling. |
|
71 | # Check if the source file exists before attempt compiling. |
|
72 | if !FileTest.exists? params[:source_file] |
|
72 | if !FileTest.exists? params[:source_file] |
|
73 | talk("ERROR: The source file does not exist!") |
|
73 | talk("ERROR: The source file does not exist!") |
|
74 | open(params[:message_file],"w") do |f| |
|
74 | open(params[:message_file],"w") do |f| |
|
75 | f.puts "ERROR: The source file did not exist." |
|
75 | f.puts "ERROR: The source file did not exist." |
|
76 | end |
|
76 | end |
|
77 | exit(127) |
|
77 | exit(127) |
|
78 | end |
|
78 | end |
|
79 |
|
79 | ||
|
80 | if params[:prog_lang]=='cpp' |
|
80 | if params[:prog_lang]=='cpp' |
|
81 | params[:prog_lang] = 'c++' |
|
81 | params[:prog_lang] = 'c++' |
|
82 | end |
|
82 | end |
|
83 |
|
83 | ||
|
84 | # Compile. |
|
84 | # Compile. |
|
85 | case params[:prog_lang] |
|
85 | case params[:prog_lang] |
|
86 |
|
86 | ||
|
87 | when "c" |
|
87 | when "c" |
|
88 | command = "#{C_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}" |
|
88 | command = "#{C_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}" |
|
89 | system(command) |
|
89 | system(command) |
|
90 |
|
90 | ||
|
91 | when "c++" |
|
91 | when "c++" |
|
92 | command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}" |
|
92 | command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}" |
|
93 | system(command) |
|
93 | system(command) |
|
94 |
|
94 | ||
|
95 | when "pas" |
|
95 | when "pas" |
|
96 | command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}" |
|
96 | command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}" |
|
97 | system(command) |
|
97 | system(command) |
|
98 | FileUtils.mv("output", params[:output_file]) |
|
98 | FileUtils.mv("output", params[:output_file]) |
|
99 |
|
99 | ||
|
100 | else |
|
100 | else |
|
101 | talk("ERROR: Invalid language specified!") |
|
101 | talk("ERROR: Invalid language specified!") |
|
102 | open(params[:message_file],"w") do |f| |
|
102 | open(params[:message_file],"w") do |f| |
|
103 | f.puts "ERROR: Invalid language specified!" |
|
103 | f.puts "ERROR: Invalid language specified!" |
|
104 | end |
|
104 | end |
|
105 | exit(127) |
|
105 | exit(127) |
|
106 | end |
|
106 | end |
|
107 |
|
107 | ||
|
108 | # Report success or failure. |
|
108 | # Report success or failure. |
|
109 | if FileTest.exists? params[:output_file] |
|
109 | if FileTest.exists? params[:output_file] |
|
110 | talk "Compilation was successful!" |
|
110 | talk "Compilation was successful!" |
|
111 | else |
|
111 | else |
|
112 | talk "ERROR: Something was wrong during the compilation!" |
|
112 | talk "ERROR: Something was wrong during the compilation!" |
|
113 | end |
|
113 | end |
You need to be logged in to leave comments.
Login now