cafe-grader-web Commit - r186:c74af5659ae2

cafe-grader-web

Commit `r186:c74af5659ae2` public

parent | child

Description:

changed grader-batch to handle only batch tasks. git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@392 6386c4cd-e34a-4fa8-8920-d93eb39b512e

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r186:c74af5659ae2 - Wed, 13 May 2009 04:38:44 - 4 files changed: 288 inserted, 153 deleted

judge/scripts/grader created 755 ¶ +217

			@@ -0,0 +1,217
		1	+ #!/usr/bin/ruby
		2	+
		3	+ def stop_grader(id)
		4	+ if id==:all
		5	+ File.open(File.dirname(__FILE__) + "/stop.all",'w').close
		6	+ else
		7	+ File.open(File.dirname(__FILE__) + "/stop.#{id}",'w').close
		8	+ end
		9	+ end
		10	+
		11	+ def check_stopfile
		12	+ FileTest.exist?(File.dirname(__FILE__) + "/stop.all") or
		13	+ FileTest.exist?(File.dirname(__FILE__) + "/stop.#{Process.pid}")
		14	+ end
		15	+
		16	+ def clear_stopfile
		17	+ if FileTest.exist?(File.dirname(__FILE__) + "/stop.#{Process.pid}")
		18	+ system("rm " + File.dirname(__FILE__) + "/stop.#{Process.pid}")
		19	+ end
		20	+ end
		21	+
		22	+ def config
		23	+ Grader::Configuration.get_instance
		24	+ end
		25	+
		26	+ def log_file_name
		27	+ if !File.exists?(config.log_dir)
		28	+ raise "Log directory does not exist: #{config.log_dir}"
		29	+ end
		30	+ config.log_dir +
		31	+ "/#{GRADER_ENV}_#{config.grader_mode}.#{Process.pid}"
		32	+ end
		33	+
		34	+ def log(str)
		35	+ if config.talkative
		36	+ puts str
		37	+ end
		38	+ if config.logging
		39	+ fp = File.open(log_file_name,"a")
		40	+ fp.puts("GRADER: #{Time.new.strftime("%H:%M")} #{str}")
		41	+ fp.close
		42	+ end
		43	+ end
		44	+
		45	+ def display_manual
		46	+ puts <<USAGE
		47	+ Grader.
		48	+ using: (1) grader
		49	+ (2) grader environment [mode]
		50	+ (3) grader stop [all\|pids-list]
		51	+ (4) grader --help
		52	+ (1) call grader with environment = 'exam', mode = 'queue'
		53	+ (2) possible modes are: 'queue', 'prob', 'test_request'
		54	+ (3) create stop-file to stop running grader in queue mode
		55	+ (4) You are here.
		56	+ USAGE
		57	+ end
		58	+
		59	+ #########################################
		60	+ # main program
		61	+ #########################################
		62	+
		63	+ # with --help
		64	+ if (ARGV.length==1) and (/help/.match(ARGV[0]))
		65	+ display_manual
		66	+ exit(0)
		67	+ end
		68	+
		69	+ # reading environment and options
		70	+ if (ARGV.length >= 1) and (ARGV[0]=='stop')
		71	+ if ARGV.length==1
		72	+ puts "you should specify pid-list or 'all'"
		73	+ display_manual
		74	+ elsif (ARGV.length==2) and (ARGV[1]=='all')
		75	+ stop_grader(:all)
		76	+ puts "A global stop file ('stop.all') created."
		77	+ puts "You should remove it manually later."
		78	+ else
		79	+ (1..ARGV.length-1).each do \|i\|
		80	+ stop_grader(ARGV[i])
		81	+ end
		82	+ puts "stop file(s) created"
		83	+ end
		84	+ exit(0)
		85	+ end
		86	+
		87	+ if check_stopfile
		88	+ puts "Stop file exists. Terminated."
		89	+ clear_stopfile
		90	+ exit(0)
		91	+ end
		92	+
		93	+ grader_mode = 'queue'
		94	+ if ARGV.length >= 1
		95	+ GRADER_ENV = ARGV[0]
		96	+ if ARGV.length >=2
		97	+ grader_mode = ARGV[1]
		98	+ end
		99	+ else
		100	+ GRADER_ENV = 'exam'
		101	+ end
		102	+
		103	+ puts "environment: #{GRADER_ENV}"
		104	+ require File.join(File.dirname(__FILE__),'config/environment')
		105	+
		106	+ # add grader_mode to config
		107	+ # this is needed because method log needs it. TODO: clean this up
		108	+ class << config
		109	+ attr_accessor :grader_mode
		110	+ end
		111	+ config.grader_mode = grader_mode
		112	+
		113	+ # reading rails environment
		114	+ log 'Reading rails environment'
		115	+
		116	+ RAILS_ENV = config.rails_env
		117	+ require RAILS_ROOT + '/config/environment'
		118	+
		119	+ # register grader process
		120	+ if config.report_grader
		121	+ grader_proc = GraderProcess.register(config.grader_hostname,
		122	+ Process.pid,
		123	+ grader_mode)
		124	+ else
		125	+ grader_proc = nil
		126	+ end
		127	+
		128	+ #set loggin environment
		129	+ ENV['GRADER_LOGGING'] = log_file_name
		130	+
		131	+ # register exit handler to report inactive, and terminated
		132	+ at_exit do
		133	+ if grader_proc!=nil
		134	+ grader_proc.report_inactive
		135	+ grader_proc.terminate
		136	+ end
		137	+ end
		138	+
		139	+ #
		140	+ # MAIN LOOP
		141	+ #
		142	+
		143	+ case grader_mode
		144	+ when "queue", "test_request"
		145	+ log "Grader: #{grader_mode}"
		146	+ if grader_mode=="queue"
		147	+ engine = Grader::Engine.new
		148	+ else
		149	+ engine = Grader::Engine.new(Grader::TestRequestRoomMaker.new,
		150	+ Grader::TestRequestReporter.new)
		151	+ end
		152	+
		153	+ runner = Grader::Runner.new(engine, grader_proc)
		154	+ while true
		155	+
		156	+ if check_stopfile # created by calling grader stop
		157	+ clear_stopfile
		158	+ log "stopped (with stop file)"
		159	+ break
		160	+ end
		161	+
		162	+ if grader_mode=="queue"
		163	+ task = runner.grade_oldest_task
		164	+ else
		165	+ task = runner.grade_oldest_test_request
		166	+ end
		167	+ if task==nil
		168	+ sleep(1)
		169	+ end
		170	+ end
		171	+
		172	+ when "prob"
		173	+ engine = Grader::Engine.new
		174	+ runner = Grader::Runner.new(engine, grader_proc)
		175	+
		176	+ grader_proc.report_active if grader_proc!=nil
		177	+
		178	+ ARGV.shift
		179	+ ARGV.shift
		180	+
		181	+ ARGV.each do \|prob_name\|
		182	+ prob = Problem.find_by_name(prob_name)
		183	+ if prob==nil
		184	+ puts "cannot find problem: #{prob_name}"
		185	+ else
		186	+ runner.grade_problem(prob)
		187	+ end
		188	+ end
		189	+
		190	+ when "sub"
		191	+ engine = Grader::Engine.new
		192	+ runner = Grader::Runner.new(engine, grader_proc)
		193	+
		194	+ grader_proc.report_active if grader_proc!=nil
		195	+
		196	+ ARGV.shift
		197	+ ARGV.shift
		198	+
		199	+ ARGV.each do \|sub_id\|
		200	+ puts "Grading #{sub_id}"
		201	+ begin
		202	+ submission = Submission.find(sub_id.to_i)
		203	+ rescue ActiveRecord::RecordNotFound
		204	+ puts "Record not found"
		205	+ submission = nil
		206	+ end
		207	+
		208	+ if submission!=nil
		209	+ runner.grade_submission(submission)
		210	+ end
		211	+ end
		212	+
		213	+ else
		214	+ display_manual
		215	+ exit(0)
		216	+ end
		217	+

judge/scripts/config/environment.rb ¶ +2 -2

               # Rails app directory
-            - RAILS_ROOT = File.join(File.dirname(__FILE__),"../../..")
-            - GRADER_ROOT = File.join(File.dirname(__FILE__),"..")
+            + RAILS_ROOT = File.expand_path(File.join(File.dirname(__FILE__),"../../.."))
+            + GRADER_ROOT = File.expand_path(File.join(File.dirname(__FILE__),".."))
               # This load all required codes
               require File.join(File.dirname(__FILE__),'../lib/boot')

judge/scripts/grader-batch ¶ +67 -149

		@@ -1,23 +1,6
1	1	#!/usr/bin/ruby
2	2
3		- def stop_grader(id)
4		- if id==:all
5		- File.open(File.dirname(__FILE__) + "/stop.all",'w').close
6		- else
7		- File.open(File.dirname(__FILE__) + "/stop.#{id}",'w').close
8		- end
9		- end
10		-
11		- def check_stopfile
12		- FileTest.exist?(File.dirname(__FILE__) + "/stop.all") or
13		- FileTest.exist?(File.dirname(__FILE__) + "/stop.#{Process.pid}")
14		- end
15		-
16		- def clear_stopfile
17		- if FileTest.exist?(File.dirname(__FILE__) + "/stop.#{Process.pid}")
18		- system("rm " + File.dirname(__FILE__) + "/stop.#{Process.pid}")
19		- end
20		- end
	3	+ require 'optparse'
21	4
22	5	def config
23	6	Grader::Configuration.get_instance
		@@ -28,7 +11,7
28	11	raise "Log directory does not exist: #{config.log_dir}"
29	12	end
30	13	config.log_dir +
31		- "/#{GRADER_ENV}~~_#{config.grader_mode}~~.#{Process.pid}"
	14	+ "/#{GRADER_ENV}.#{Process.pid}"
32	15	end
33	16
34	17	def log(str)
		@@ -42,74 +25,53
42	25	end
43	26	end
44	27
45		- def display_manual
46		- puts <<USAGE
47		- Grader.
48		- using: (1) grader
49		- (2) grader environment [mode]
50		- (3) grader stop [all\|pids-list]
51		- (4) grader --help
52		- (1) call grader with environment = 'exam', mode = 'queue'
53		- (2) possible modes are: 'queue', 'prob', 'test_request'
54		- (3) create stop-file to stop running grader in queue mode
55		- (4) You are here.
56		- USAGE
	28	+ def parse_arguments(args)
	29	+ options = {
	30	+ :environment => 'grading',
	31	+ :problems => [],
	32	+ :submissions => []
	33	+ }
	34	+ opts = OptionParser.new do \|opts\|
	35	+ opts.banner = <<BANNER
	36	+ grader-batch - the grader for batch grading..
	37	+ Usage: grader-batch [options]
	38	+ BANNER
	39	+
	40	+ opts.on("-e", "--env", "Set environment: grading (*), exam, etc.") do \|env\|
	41	+ options[:environment] = env
	42	+ end
	43	+
	44	+ opts.on("--prob p1,p2,p3", Array, "Grade problems p1, p2, and p3.") do \|prob_list\|
	45	+ options[:problems] += prob_list
	46	+ end
	47	+
	48	+ opts.on("--sub s1,s2,s3", Array, "Grade submissions specified by ids") do \|submission_list\|
	49	+ options[:submissions] += submission_list
	50	+ end
	51	+
	52	+ # help
	53	+ opts.on_tail("-h", "--help", "Show this message") do
	54	+ puts opts
	55	+ exit
	56	+ end
	57	+ end
	58	+
	59	+ opts.parse!
	60	+ return options
57	61	end
58	62
	63	+
59	64	#########################################
60	65	# main program
61	66	#########################################
62	67
63		- # with --help
64		- if (ARGV.length==1) and (/help/.match(ARGV[0]))
65		- display_manual
66		- exit(0)
67		- end
	68	+ options = parse_arguments(ARGV)
68	69
69	70	# reading environment and options
70		- if (ARGV.length >= 1) and (ARGV[0]=='stop')
71		- if ARGV.length==1
72		- puts "you should specify pid-list or 'all'"
73		- display_manual
74		- elsif (ARGV.length==2) and (ARGV[1]=='all')
75		- stop_grader(:all)
76		- puts "A global stop file ('stop.all') created."
77		- puts "You should remove it manually later."
78		- else
79		- (1..ARGV.length-1).each do \|i\|
80		- stop_grader(ARGV[i])
81		- end
82		- puts "stop file(s) created"
83		- end
84		- exit(0)
85		- end
86		-
87		- if check_stopfile
88		- puts "Stop file exists. Terminated."
89		- clear_stopfile
90		- exit(0)
91		- end
92		-
93		- grader_mode = 'queue'
94		- if ARGV.length >= 1
95		- GRADER_ENV = ARGV[0]
96		- if ARGV.length >=2
97		- grader_mode = ARGV[1]
98		- end
99		- else
100		- GRADER_ENV = 'exam'
101		- end
102		-
	71	+ GRADER_ENV = options[:environment]
103	72	puts "environment: #{GRADER_ENV}"
104	73	require File.join(File.dirname(__FILE__),'config/environment')
105	74
106		- # add grader_mode to config
107		- # this is needed because method log needs it. TODO: clean this up
108		- class << config
109		- attr_accessor :grader_mode
110		- end
111		- config.grader_mode = grader_mode
112		-
113	75	# reading rails environment
114	76	log 'Reading rails environment'
115	77
		@@ -120,7 +82,7
120	82	if config.report_grader
121	83	grader_proc = GraderProcess.register(config.grader_hostname,
122	84	Process.pid,
123		- ~~grader_mode~~)
	85	+ GRADER_ENV)
124	86	else
125	87	grader_proc = nil
126	88	end
		@@ -136,82 +98,38
136	98	end
137	99	end
138	100
139		- #
140		- # MAIN LOOP
141		- #
	101	+ # grading
	102	+
	103	+ engine = Grader::Engine.new
	104	+ runner = Grader::Runner.new(engine, grader_proc)
142	105
143		- case grader_mode
144		- when "queue", "test_request"
145		- log "Grader: #{grader_mode}"
146		- if grader_mode=="queue"
147		- engine = Grader::Engine.new
	106	+ # grade problems
	107	+ options[:problems].each do \|prob_name\|
	108	+ grader_proc.report_active if grader_proc!=nil
	109	+ prob = Problem.find_by_name(prob_name)
	110	+ if prob==nil
	111	+ puts "cannot find problem: #{prob_name}"
148	112	else
149		- engine = Grader::Engine.new(Grader::TestRequestRoomMaker.new,
150		- Grader::TestRequestReporter.new)
	113	+ runner.grade_problem(prob)
	114	+ end
	115	+ grader_proc.report_inactive if grader_proc!=nil
	116	+ end
	117	+
	118	+ # grade submissions
	119	+ options[:submissions].each do \|sub_id\|
	120	+ grader_proc.report_active if grader_proc!=nil
	121	+ puts "Grading #{sub_id}"
	122	+ begin
	123	+ submission = Submission.find(sub_id.to_i)
	124	+ rescue ActiveRecord::RecordNotFound
	125	+ puts "Record not found"
	126	+ submission = nil
151	127	end
152	128
153		- runner = Grader::Runner.new(engine, grader_proc)
154		- while true
155		-
156		- if check_stopfile # created by calling grader stop
157		- clear_stopfile
158		- log "stopped (with stop file)"
159		- break
160		- end
161		-
162		- if grader_mode=="queue"
163		- task = runner.grade_oldest_task
164		- else
165		- task = runner.grade_oldest_test_request
166		- end
167		- if task==nil
168		- sleep(1)
169		- end
	129	+ if submission!=nil
	130	+ runner.grade_submission(submission)
170	131	end
171		-
172		- when "prob"
173		- engine = Grader::Engine.new
174		- runner = Grader::Runner.new(engine, grader_proc)
175		-
176		- grader_proc.report_active if grader_proc!=nil
177		-
178		- ARGV.shift
179		- ARGV.shift
180		-
181		- ARGV.each do \|prob_name\|
182		- prob = Problem.find_by_name(prob_name)
183		- if prob==nil
184		- puts "cannot find problem: #{prob_name}"
185		- else
186		- runner.grade_problem(prob)
187		- end
188		- end
189		-
190		- when "sub"
191		- engine = Grader::Engine.new
192		- runner = Grader::Runner.new(engine, grader_proc)
193		-
194		- grader_proc.report_active if grader_proc!=nil
195		-
196		- ARGV.shift
197		- ARGV.shift
198		-
199		- ARGV.each do \|sub_id\|
200		- puts "Grading #{sub_id}"
201		- begin
202		- submission = Submission.find(sub_id.to_i)
203		- rescue ActiveRecord::RecordNotFound
204		- puts "Record not found"
205		- submission = nil
206		- end
207		-
208		- if submission!=nil
209		- runner.grade_submission(submission)
210		- end
211		- end
212		-
213		- else
214		- display_manual
215		- exit(0)
	132	+ grader_proc.report_inactive if grader_proc!=nil
216	133	end
217	134
	135	+ puts "Done."

judge/scripts/lib/engine.rb ¶ +2 -2

                         copy_log = copy_script(problem_home)
                         save_copy_log(problem_home,copy_log)
                       end
+            -
+            +
                       call_judge(problem_home,language,grading_dir,source_name)
                       @reporter.report(submission,"#{grading_dir}/test-result")
                   def call_judge(problem_home,language,grading_dir,fname)
                     ENV['PROBLEM_HOME'] = problem_home
-            -       talk grading_dir
+            +       talk "Grading in #{grading_dir}"
                     Dir.chdir grading_dir
                     cmd = "#{problem_home}/script/judge #{language} #{fname}"
                     talk "CMD: #{cmd}"

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r186:c74af5659ae2 - Wed, 13 May 2009 04:38:44 - 4 files changed: 288 inserted, 153 deleted

Sign in to your account

Commit r186:c74af5659ae2 public

Author

r186:c74af5659ae2 - Wed, 13 May 2009 04:38:44 - 4 files changed: 288 inserted, 153 deleted

Commit `r186:c74af5659ae2` public