Description:
merge
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r177:c2734213b50c - - 1 file changed: 1 inserted, 1 deleted
| @@ -240,232 +240,232 | |||||
|
|
240 | end |
|
240 | end |
|
|
241 |
|
241 | ||
|
|
242 | prob_reporter = Grader::SubmissionReporter.new(:dry_run => options[:dry_run], |
|
242 | prob_reporter = Grader::SubmissionReporter.new(:dry_run => options[:dry_run], |
|
|
243 | :result_collector => result_collector) |
|
243 | :result_collector => result_collector) |
|
|
244 |
|
244 | ||
|
|
245 | engine = Grader::Engine.new(:reporter => prob_reporter) |
|
245 | engine = Grader::Engine.new(:reporter => prob_reporter) |
|
|
246 | runner = Grader::Runner.new(engine, grader_proc) |
|
246 | runner = Grader::Runner.new(engine, grader_proc) |
|
|
247 |
|
247 | ||
|
|
248 | grader_proc.report_active if grader_proc!=nil |
|
248 | grader_proc.report_active if grader_proc!=nil |
|
|
249 |
|
249 | ||
|
|
250 | latest_submitted_at = nil |
|
250 | latest_submitted_at = nil |
|
|
251 | graded_submission_ids = {} |
|
251 | graded_submission_ids = {} |
|
|
252 |
|
252 | ||
|
|
253 | while true |
|
253 | while true |
|
|
254 |
|
254 | ||
|
|
255 | if check_stopfile # created by calling grader stop |
|
255 | if check_stopfile # created by calling grader stop |
|
|
256 | clear_stopfile |
|
256 | clear_stopfile |
|
|
257 | log "stopped (with stop file)" |
|
257 | log "stopped (with stop file)" |
|
|
258 | break |
|
258 | break |
|
|
259 | end |
|
259 | end |
|
|
260 |
|
260 | ||
|
|
261 | if latest_submitted_at==nil |
|
261 | if latest_submitted_at==nil |
|
|
262 | submissions = Submission.all |
|
262 | submissions = Submission.all |
|
|
263 | else |
|
263 | else |
|
|
264 | submissions = Submission.all(:conditions => ["submitted_at >= :latest", |
|
264 | submissions = Submission.all(:conditions => ["submitted_at >= :latest", |
|
|
265 | {:latest => latest_submitted_at}]) |
|
265 | {:latest => latest_submitted_at}]) |
|
|
266 | end |
|
266 | end |
|
|
267 |
|
267 | ||
|
|
268 | graded_any = false |
|
268 | graded_any = false |
|
|
269 |
|
269 | ||
|
|
270 | if submissions.length != 0 |
|
270 | if submissions.length != 0 |
|
|
271 | submissions.each do |submission| |
|
271 | submissions.each do |submission| |
|
|
272 | if (submission.problem == nil) or (!submission.problem.available) |
|
272 | if (submission.problem == nil) or (!submission.problem.available) |
|
|
273 | next |
|
273 | next |
|
|
274 | end |
|
274 | end |
|
|
275 | if ! graded_submission_ids[submission.id] |
|
275 | if ! graded_submission_ids[submission.id] |
|
|
276 | runner.grade_submission(submission) |
|
276 | runner.grade_submission(submission) |
|
|
277 | graded_submission_ids[submission.id] = true |
|
277 | graded_submission_ids[submission.id] = true |
|
|
278 | if (!latest_submitted_at or |
|
278 | if (!latest_submitted_at or |
|
|
279 | latest_submitted_at < submission.submitted_at) |
|
279 | latest_submitted_at < submission.submitted_at) |
|
|
280 | latest_submitted_at = submission.submitted_at |
|
280 | latest_submitted_at = submission.submitted_at |
|
|
281 | end |
|
281 | end |
|
|
282 | puts "graded: #{submission.id}" |
|
282 | puts "graded: #{submission.id}" |
|
|
283 | puts "latest: #{latest_submitted_at}" |
|
283 | puts "latest: #{latest_submitted_at}" |
|
|
284 | graded_any = true |
|
284 | graded_any = true |
|
|
285 | end |
|
285 | end |
|
|
286 | end |
|
286 | end |
|
|
287 | end |
|
287 | end |
|
|
288 |
|
288 | ||
|
|
289 | if ! graded_any |
|
289 | if ! graded_any |
|
|
290 | sleep(1) |
|
290 | sleep(1) |
|
|
291 | end |
|
291 | end |
|
|
292 | end |
|
292 | end |
|
|
293 | end |
|
293 | end |
|
|
294 |
|
294 | ||
|
|
295 | def grader_grade_problems(grader_proc, options) |
|
295 | def grader_grade_problems(grader_proc, options) |
|
|
296 | if options[:report] |
|
296 | if options[:report] |
|
|
297 | result_collector = ResultCollector.new |
|
297 | result_collector = ResultCollector.new |
|
|
298 | else |
|
298 | else |
|
|
299 | result_collector = nil |
|
299 | result_collector = nil |
|
|
300 | end |
|
300 | end |
|
|
301 |
|
301 | ||
|
|
302 | if options[:dry_run] |
|
302 | if options[:dry_run] |
|
|
303 | puts "Running in dry mode" |
|
303 | puts "Running in dry mode" |
|
|
304 | end |
|
304 | end |
|
|
305 |
|
305 | ||
|
|
306 | prob_reporter = Grader::SubmissionReporter.new(:dry_run => options[:dry_run], |
|
306 | prob_reporter = Grader::SubmissionReporter.new(:dry_run => options[:dry_run], |
|
|
307 | :result_collector => result_collector) |
|
307 | :result_collector => result_collector) |
|
|
308 | engine = Grader::Engine.new(:reporter => prob_reporter) |
|
308 | engine = Grader::Engine.new(:reporter => prob_reporter) |
|
|
309 | runner = Grader::Runner.new(engine, grader_proc) |
|
309 | runner = Grader::Runner.new(engine, grader_proc) |
|
|
310 |
|
310 | ||
|
|
311 | grader_proc.report_active if grader_proc!=nil |
|
311 | grader_proc.report_active if grader_proc!=nil |
|
|
312 |
|
312 | ||
|
|
313 | ARGV.each do |prob_name| |
|
313 | ARGV.each do |prob_name| |
|
|
314 | prob = Problem.find_by_name(prob_name) |
|
314 | prob = Problem.find_by_name(prob_name) |
|
|
315 | if prob==nil |
|
315 | if prob==nil |
|
|
316 | puts "cannot find problem: #{prob_name}" |
|
316 | puts "cannot find problem: #{prob_name}" |
|
|
317 | else |
|
317 | else |
|
|
318 | runner.grade_problem(prob,options) |
|
318 | runner.grade_problem(prob,options) |
|
|
319 | end |
|
319 | end |
|
|
320 | end |
|
320 | end |
|
|
321 |
|
321 | ||
|
|
322 | if options[:report] |
|
322 | if options[:report] |
|
|
323 | result_collector.print_report_by_user |
|
323 | result_collector.print_report_by_user |
|
|
324 | end |
|
324 | end |
|
|
325 | end |
|
325 | end |
|
|
326 |
|
326 | ||
|
|
327 | def grader_grade_contests(grader_proc, options) |
|
327 | def grader_grade_contests(grader_proc, options) |
|
|
328 | # always use dry run when grading during contest |
|
328 | # always use dry run when grading during contest |
|
|
329 | dry_run = options[:dry_run] = true |
|
329 | dry_run = options[:dry_run] = true |
|
|
330 |
|
330 | ||
|
|
331 | contest_name = ARGV.shift |
|
331 | contest_name = ARGV.shift |
|
|
332 |
|
332 | ||
|
|
333 | contest = Contest.find_by_name(contest_name) |
|
333 | contest = Contest.find_by_name(contest_name) |
|
|
334 | if contest==nil |
|
334 | if contest==nil |
|
|
335 | puts "cannot find contest: #{contest_name}" |
|
335 | puts "cannot find contest: #{contest_name}" |
|
|
336 | exit(0) |
|
336 | exit(0) |
|
|
337 | end |
|
337 | end |
|
|
338 |
|
338 | ||
|
|
339 | if options[:report] |
|
339 | if options[:report] |
|
|
340 | result_collector = ResultCollector.new |
|
340 | result_collector = ResultCollector.new |
|
|
341 | else |
|
341 | else |
|
|
342 | result_collector = nil |
|
342 | result_collector = nil |
|
|
343 | end |
|
343 | end |
|
|
344 |
|
344 | ||
|
|
345 | if options[:dry_run] |
|
345 | if options[:dry_run] |
|
|
346 | puts "Running in dry mode" |
|
346 | puts "Running in dry mode" |
|
|
347 | end |
|
347 | end |
|
|
348 |
|
348 | ||
|
|
349 | prob_reporter = Grader::SubmissionReporter.new(:dry_run => dry_run, |
|
349 | prob_reporter = Grader::SubmissionReporter.new(:dry_run => dry_run, |
|
|
350 | :result_collector => result_collector) |
|
350 | :result_collector => result_collector) |
|
|
351 | engine = Grader::Engine.new(:reporter => prob_reporter) |
|
351 | engine = Grader::Engine.new(:reporter => prob_reporter) |
|
|
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 | contest.problems.each do |problem| |
|
356 | contest.problems.each do |problem| |
|
|
357 | puts "Grading: #{problem.name}" |
|
357 | puts "Grading: #{problem.name}" |
|
|
358 | runner.grade_problem(problem, |
|
358 | runner.grade_problem(problem, |
|
|
359 | :user_conditions => lambda do |u| |
|
359 | :user_conditions => lambda do |u| |
|
|
360 | u.contest_finished? and |
|
360 | u.contest_finished? and |
|
|
361 | u.contest_ids.include?(contest.id) |
|
361 | u.contest_ids.include?(contest.id) |
|
|
362 | end) |
|
362 | end) |
|
|
363 | end |
|
363 | end |
|
|
364 |
|
364 | ||
|
|
365 | if options[:report] |
|
365 | if options[:report] |
|
|
366 | result_collector.print_report_by_user |
|
366 | result_collector.print_report_by_user |
|
|
367 | end |
|
367 | end |
|
|
368 | end |
|
368 | end |
|
|
369 |
|
369 | ||
|
|
370 | def grader_grade_submissions(grader_proc, options) |
|
370 | def grader_grade_submissions(grader_proc, options) |
|
|
371 | engine = Grader::Engine.new |
|
371 | engine = Grader::Engine.new |
|
|
372 | runner = Grader::Runner.new(engine, grader_proc) |
|
372 | runner = Grader::Runner.new(engine, grader_proc) |
|
|
373 |
|
373 | ||
|
|
374 | grader_proc.report_active if grader_proc!=nil |
|
374 | grader_proc.report_active if grader_proc!=nil |
|
|
375 |
|
375 | ||
|
|
376 | ARGV.each do |sub_id| |
|
376 | ARGV.each do |sub_id| |
|
|
377 | puts "Grading #{sub_id}" |
|
377 | puts "Grading #{sub_id}" |
|
|
378 | begin |
|
378 | begin |
|
|
379 | submission = Submission.find(sub_id.to_i) |
|
379 | submission = Submission.find(sub_id.to_i) |
|
|
380 | rescue ActiveRecord::RecordNotFound |
|
380 | rescue ActiveRecord::RecordNotFound |
|
|
381 | puts "Submission #{sub_id} not found" |
|
381 | puts "Submission #{sub_id} not found" |
|
|
382 | submission = nil |
|
382 | submission = nil |
|
|
383 | end |
|
383 | end |
|
|
384 |
|
384 | ||
|
|
385 | if submission!=nil |
|
385 | if submission!=nil |
|
|
386 | runner.grade_submission(submission) |
|
386 | runner.grade_submission(submission) |
|
|
387 | end |
|
387 | end |
|
|
388 | end |
|
388 | end |
|
|
389 | end |
|
389 | end |
|
|
390 |
|
390 | ||
|
|
391 | ######################################### |
|
391 | ######################################### |
|
|
392 | # main program |
|
392 | # main program |
|
|
393 | ######################################### |
|
393 | ######################################### |
|
|
394 |
|
394 | ||
|
|
395 | options = process_options_and_stop_file |
|
395 | options = process_options_and_stop_file |
|
|
396 | GRADER_ENV = options[:environment] |
|
396 | GRADER_ENV = options[:environment] |
|
|
397 | grader_mode = options[:mode] |
|
397 | grader_mode = options[:mode] |
|
|
398 | dry_run = options[:dry_run] |
|
398 | dry_run = options[:dry_run] |
|
|
399 |
|
399 | ||
|
|
400 | puts "environment: #{GRADER_ENV}" |
|
400 | puts "environment: #{GRADER_ENV}" |
|
|
401 | puts "grader mode: #{grader_mode}" |
|
401 | puts "grader mode: #{grader_mode}" |
|
|
402 | require File.join(File.dirname(__FILE__),'config/environment') |
|
402 | require File.join(File.dirname(__FILE__),'config/environment') |
|
|
403 |
|
403 | ||
|
|
404 | # add grader_mode to config |
|
404 | # add grader_mode to config |
|
|
405 | # this is needed because method log needs it. TODO: clean this up |
|
405 | # this is needed because method log needs it. TODO: clean this up |
|
|
406 | class << config |
|
406 | class << config |
|
|
407 | attr_accessor :grader_mode |
|
407 | attr_accessor :grader_mode |
|
|
408 | end |
|
408 | end |
|
|
409 | config.grader_mode = grader_mode |
|
409 | config.grader_mode = grader_mode |
|
|
410 |
|
410 | ||
|
|
411 | # reading rails environment |
|
411 | # reading rails environment |
|
|
412 | log 'Reading rails environment' |
|
412 | log 'Reading rails environment' |
|
|
413 |
|
413 | ||
|
|
414 | RAILS_ENV = config.rails_env |
|
414 | RAILS_ENV = config.rails_env |
|
|
415 | require RAILS_ROOT + '/config/environment' |
|
415 | require RAILS_ROOT + '/config/environment' |
|
|
416 |
|
416 | ||
|
|
417 | # register grader process |
|
417 | # register grader process |
|
|
418 | if config.report_grader |
|
418 | if config.report_grader |
|
|
419 | grader_proc = GraderProcess.register(config.grader_hostname, |
|
419 | grader_proc = GraderProcess.register(config.grader_hostname, |
|
|
420 | Process.pid, |
|
420 | Process.pid, |
|
|
421 | grader_mode) |
|
421 | grader_mode) |
|
|
422 | else |
|
422 | else |
|
|
423 | grader_proc = nil |
|
423 | grader_proc = nil |
|
|
424 | end |
|
424 | end |
|
|
425 |
|
425 | ||
|
|
426 | #set loggin environment |
|
426 | #set loggin environment |
|
|
427 | ENV['GRADER_LOGGING'] = log_file_name |
|
427 | ENV['GRADER_LOGGING'] = log_file_name |
|
|
428 | if options[:err_log] |
|
428 | if options[:err_log] |
|
|
429 | err_file_name = log_file_name + '.err' |
|
429 | err_file_name = log_file_name + '.err' |
|
|
430 | $stderr.reopen(err_file_name,"a") |
|
430 | $stderr.reopen(err_file_name,"a") |
|
|
431 | log "STDERR log to file [#{err_file_name}]" |
|
431 | log "STDERR log to file [#{err_file_name}]" |
|
|
432 | - warn "start logging for grader PID #{Process.id} on #{Time.now.in_time_zone}" |
|
432 | + warn "start logging for grader PID #{Process.pid} on #{Time.now.in_time_zone}" |
|
|
433 | end |
|
433 | end |
|
|
434 |
|
434 | ||
|
|
435 |
|
435 | ||
|
|
436 | # register exit handler to report inactive, and terminated |
|
436 | # register exit handler to report inactive, and terminated |
|
|
437 | at_exit do |
|
437 | at_exit do |
|
|
438 | if grader_proc!=nil |
|
438 | if grader_proc!=nil |
|
|
439 | grader_proc.report_inactive |
|
439 | grader_proc.report_inactive |
|
|
440 | grader_proc.terminate |
|
440 | grader_proc.terminate |
|
|
441 | end |
|
441 | end |
|
|
442 | end |
|
442 | end |
|
|
443 |
|
443 | ||
|
|
444 | # |
|
444 | # |
|
|
445 | # MAIN LOOP |
|
445 | # MAIN LOOP |
|
|
446 | # |
|
446 | # |
|
|
447 |
|
447 | ||
|
|
448 | case grader_mode |
|
448 | case grader_mode |
|
|
449 | when "queue" |
|
449 | when "queue" |
|
|
450 | grader_queue_loop(grader_proc, options) |
|
450 | grader_queue_loop(grader_proc, options) |
|
|
451 |
|
451 | ||
|
|
452 | when "test_request" |
|
452 | when "test_request" |
|
|
453 | grader_test_request_loop(grader_proc, options) |
|
453 | grader_test_request_loop(grader_proc, options) |
|
|
454 |
|
454 | ||
|
|
455 | when "prob" |
|
455 | when "prob" |
|
|
456 | grader_grade_problems(grader_proc, options) |
|
456 | grader_grade_problems(grader_proc, options) |
|
|
457 |
|
457 | ||
|
|
458 | when "contest" |
|
458 | when "contest" |
|
|
459 | grader_grade_contests(grader_proc, options) |
|
459 | grader_grade_contests(grader_proc, options) |
|
|
460 |
|
460 | ||
|
|
461 | when "sub" |
|
461 | when "sub" |
|
|
462 | grader_grade_submissions(grader_proc, options) |
|
462 | grader_grade_submissions(grader_proc, options) |
|
|
463 |
|
463 | ||
|
|
464 | when "autonew" |
|
464 | when "autonew" |
|
|
465 | grader_autonew_loop(grader_proc, options) |
|
465 | grader_autonew_loop(grader_proc, options) |
|
|
466 |
|
466 | ||
|
|
467 | else |
|
467 | else |
|
|
468 | display_manual |
|
468 | display_manual |
|
|
469 | exit(0) |
|
469 | exit(0) |
|
|
470 | end |
|
470 | end |
|
|
471 |
|
471 | ||
You need to be logged in to leave comments.
Login now