From: <Or...@us...> - 2008-09-14 15:01:06
|
Revision: 349 http://acmcontester.svn.sourceforge.net/acmcontester/?rev=349&view=rev Author: Oracle_ Date: 2008-09-14 15:01:05 +0000 (Sun, 14 Sep 2008) Log Message: ----------- Fixed bug with Too large array in Double security and updated waiting for files. Modified Paths: -------------- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/Program.cs ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/problem/ProblemData.txt ACMServer/trunk/sharp tester/SourceTest 2.0/Test/CompileClass.cpp ACMServer/trunk/sharp tester/SourceTest 2.0/Test/CompileClass.h ACMServer/trunk/sharp tester/SourceTest 2.0/Test/SecureClass.h ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.cpp ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.h Added Paths: ----------- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source1.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source10.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source11.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source12.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source13.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source14.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source15.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source16.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source17.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source18.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source2.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source3.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source4.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source5.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source6.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source7.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source8.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source9.txt Removed Paths: ------------- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/out.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/source.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err1.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err10.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err11.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err12.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err13.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err14.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err15.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err2.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err3.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err4.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err5.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err6.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err7.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err8.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/err9.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out1.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out10.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out11.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out12.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out13.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out14.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out15.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out2.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out3.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out4.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out5.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out6.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out7.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out8.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out9.txt ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/source.exe ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/source.txt Modified: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/Program.cs =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/Program.cs 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/Program.cs 2008-09-14 15:01:05 UTC (rev 349) @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Text; using System.IO; using Main; @@ -12,22 +11,32 @@ { static void Main(string[] args) { + Console.SetOut(File.CreateText("D:\\logout.txt")); string[] data=File.ReadAllLines("InData.txt"); - TestEnv test = new TestEnv(File.ReadAllText("source.txt"),data[0],data[1],data[2]); - test.Compile(); - Console.WriteLine("Compile result: {0}, details: {1}, usedtime:{2}",test.comp.Result.ToString(),test.comp.Details,test.comp.UsedTime); - Console.WriteLine("Comp Output: {0}", test.comp.CompilerOutput); - if (test.comp.Result == Test.CompRes.OK) + for (int ind = 1; ind <= 18; ind++) { - test.RunAllTests(SecureType.Double); + string src = File.ReadAllText("src\\source" + ind.ToString() + ".txt"); + TestEnv test = new TestEnv(src, data[0], data[1], data[2]); + test.Compile(); + Console.WriteLine("------------------BEGIN SOURCE #"+ind.ToString()+"--------------------------"); + Console.WriteLine(src); + Console.WriteLine("-------------------END SOURCE #" + ind.ToString() + "---------------------------"); + Console.WriteLine("Compile result: {0}, details: {1}, usedtime:{2}", test.comp.Result.ToString(), test.comp.Details, test.comp.UsedTime); + Console.WriteLine("Comp Output: {0}", test.comp.CompilerOutput); + if (test.comp.Result == Test.CompRes.OK) + { + test.RunAllTests(SecureType.Double); - for (int i = 0; i < test.run.results.Length; i++) - { - Console.WriteLine("Test #{0} result: {1}, details: {2}, usedtime:{3}, usedRealTime: {4}, usedmemory: {5}", i + 1, - test.run.results[i].res, test.run.results[i].Details, test.run.results[i].UsedTime, test.run.results[i].UsedRealTime, test.run.results[i].UsedMemory); + for (int i = 0; i < test.run.results.Length; i++) + { + Console.WriteLine("Test #{0} result: {1}, details: {2}, usedtime:{3}, usedRealTime: {4}, usedmemory: {5}", i + 1, + test.run.results[i].res, test.run.results[i].Details, test.run.results[i].UsedTime, test.run.results[i].UsedRealTime, test.run.results[i].UsedMemory); + } } +// Console.ReadKey(); } - Console.ReadKey(); + Console.Out.Flush(); + Console.Out.Close(); } } } Modified: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/problem/ProblemData.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/problem/ProblemData.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/problem/ProblemData.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -4,6 +4,6 @@ OutputLimit: 1024 RealTimeLimit: 20000 TimeLimit: 1000 -MaxThreads: 1 +MaxThreads: 4 Checker: scriptExample.txt CheckPlugin: Plugin.dll \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/source.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/source.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/source.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1,28 +0,0 @@ -var a,b:integer; -begin -read(a,b); -write(a+b); -end. - -uses math; -begin - -end. - -uses windows; -var a,b:integer; -begin -read(a,b); -write(a+b); -end. - -var a:array [1..2147000000] of char; -begin - fillchar(a,0,sizeof(a)); -end. - -begin -assignfile(output,'out.txt'); -rewrite(output); -closefile(output); -end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source1.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source1.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source1.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,6 @@ +uses windows; +var s:string; +begin +readln(s); +writeln(length(s)); +end. Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source10.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source10.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source10.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,4 @@ +uses windows; +begin +Sleep(100000); +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source11.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source11.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source11.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,2 @@ +begin +end; \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source12.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source12.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source12.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,3 @@ +begin +while true do; +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source13.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source13.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source13.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,3 @@ +begin +while true do write(' '); +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source14.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source14.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source14.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,4 @@ +var a:Char; +begin + while true do read(a); +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source15.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source15.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source15.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,8 @@ +uses Windows; +var k:HKEY; +begin + RegOpenKeyEx(HKEY_CURRENT_USER,'Software\',0,KEY_ALL_ACCESS,k); + RegSetValueEx(k,'GAME2',0,REG_SZ,pchar('hello'),5); + if RegQueryValueEx(k,'GAME2',nil,nil,nil,nil)<>0 then + while true do; +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source16.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source16.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source16.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,8 @@ +var a:array [1..10] of Integer; +x,y:integer; +begin + x:=10000; + a[x]:=138; + readln(x,y); + writeln(x+y); +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source17.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source17.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source17.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,6 @@ +program Project2; +{$APPTYPE CONSOLE} +uses Windows; +begin + MessageBox(GetDesktopWindow(),'Hello!','Hello',MB_OK); +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source18.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source18.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source18.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,9 @@ +var a,b:Extended; +i:Integer; +x:array of Integer; +begin + read(a,b); + for i:=1 to 5700000 do + a:=sqrt(a)*sqrt(a)+((sqrt(a)*sqrt(a))/sqrt(a))/sqrt(a)-1; + write(a+b:0:0); +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source2.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source2.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source2.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,5 @@ +begin +assignfile(output,'out.txt'); +rewrite(output); +closefile(output); +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source3.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source3.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source3.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,4 @@ +uses math; +begin + +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source4.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source4.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source4.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,6 @@ +uses windows; +var a,b:integer; +begin +read(a,b); +write(a+b); +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source5.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source5.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source5.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,4 @@ +var a:array [1..2147000000] of char; +begin + fillchar(a,0,sizeof(a)); +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source6.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source6.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source6.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,8 @@ +type MyStruct=record +a:array [1..1000000] of Integer; +end; + +var a:^MyStruct; +begin +new(a); +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source7.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source7.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source7.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,4 @@ +var a:array [1..1000000] of Integer; +begin +fillchar(a,sizeof(a),0); +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source8.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source8.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source8.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,8 @@ +var a,b:Extended; +i:integer; +begin +read(a,b); +for i:=1 to 10000000 do + a:=sqrt(a)*sqrt(a); +write(a+b:0:0); +end. \ No newline at end of file Added: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source9.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source9.txt (rev 0) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/src/source9.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -0,0 +1,9 @@ +var x:array [1..1000000] of ^Integer; +i:integer; +begin +fillchar(x,sizeof(x),0); +for i:=1 to 1000000 do + new(x[i]); +for i:=1 to 1000000 do + dispose(x[i]); +end. \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out1.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out1.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out1.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -2 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out10.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out10.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out10.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out11.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out11.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out11.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out12.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out12.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out12.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out13.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out13.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out13.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out14.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out14.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out14.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out15.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out15.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out15.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out2.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out2.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out2.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out3.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out3.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out3.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out4.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out4.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out4.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out5.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out5.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out5.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out6.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out6.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out6.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out7.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out7.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out7.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out8.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out8.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out8.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out9.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out9.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/out9.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1 +0,0 @@ -1349 \ No newline at end of file Deleted: ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/source.txt =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/source.txt 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/SourceTest 2.0/bin/Debug/temp/source.txt 2008-09-14 15:01:05 UTC (rev 349) @@ -1,28 +0,0 @@ -var a,b:integer; -begin -read(a,b); -write(a+b); -end. - -uses math; -begin - -end. - -uses windows; -var a,b:integer; -begin -read(a,b); -write(a+b); -end. - -var a:array [1..2147000000] of char; -begin - fillchar(a,0,sizeof(a)); -end. - -begin -assignfile(output,'out.txt'); -rewrite(output); -closefile(output); -end. \ No newline at end of file Modified: ACMServer/trunk/sharp tester/SourceTest 2.0/Test/CompileClass.cpp =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/Test/CompileClass.cpp 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/Test/CompileClass.cpp 2008-09-14 15:01:05 UTC (rev 349) @@ -35,7 +35,7 @@ src->Write(source); src->Close(); - System::Threading::Thread::Sleep(CONST_SLEEP); //waiting for file to flush on hard + WaitForFile(srcpath); si->FileName=comppath; si->Arguments="\""+srcpath+"\" \""+temp; @@ -53,7 +53,7 @@ } UsedTime=comp->TotalProcessorTime; - System::Threading::Thread::Sleep(CONST_SLEEP); //waiting for creating the file + WaitForFile(ExeFile); if (!File::Exists(ExeFile)) //compilation error { @@ -70,4 +70,24 @@ { comp->Close(); } +} + +void Compiler::WaitForFile(String^ FileName) +{ + for (int i=0;i<CONST_SLEEP;++i) + if (!File::Exists(FileName)) + System::Threading::Thread::Sleep(1); + for (int i=0;i<CONST_SLEEP;++i) + { + try + { + FileStream^ f=File::OpenRead(FileName); + f->Close(); + break; + } catch(...) + { + System::Threading::Thread::Sleep(1); + continue; + } + } } \ No newline at end of file Modified: ACMServer/trunk/sharp tester/SourceTest 2.0/Test/CompileClass.h =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/Test/CompileClass.h 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/Test/CompileClass.h 2008-09-14 15:01:05 UTC (rev 349) @@ -22,6 +22,7 @@ String^ comppath; String^ source; String^ temp; + void WaitForFile(String^ FileName); public: String^ Details; CompRes Result; Modified: ACMServer/trunk/sharp tester/SourceTest 2.0/Test/SecureClass.h =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/Test/SecureClass.h 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/Test/SecureClass.h 2008-09-14 15:01:05 UTC (rev 349) @@ -22,7 +22,7 @@ virtual bool CreateProc(LPWSTR lpApplicationName,BOOL bInheritHandles,DWORD dwCreationFlags,LPSTARTUPINFOW lpStartupInfo) {return true;}; virtual bool CheckSecure() {return true;}; virtual void Finalize() {}; - int LastError() {return err;}; + virtual int LastError() {return err;}; }; public class UserSecure: public BasicSecure @@ -70,6 +70,7 @@ bool CreateProc(LPWSTR lpApplicationName,BOOL bInheritHandles,DWORD dwCreationFlags,LPSTARTUPINFOW lpStartupInfo); bool CheckSecure(); void Finalize(); + int LastError() {return syssec->LastError(); } }; public class NoneSecure:public BasicSecure Modified: ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.cpp =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.cpp 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.cpp 2008-09-14 15:01:05 UTC (rev 349) @@ -70,8 +70,16 @@ unlock(); if (!sec->Init(bufW)) { - result->res=TestResult::InternalError; - result->Details=gcnew String(sec->Details.c_str())+" Can not init secure"; + int err=sec->LastError(); + if ((err==193)||(err==1455)) + { + result->res=TestResult::RuntimeError; + result->Details=gcnew String(sec->Details.c_str())+" Too large array"; + } else + { + result->res=TestResult::InternalError; + result->Details=gcnew String(sec->Details.c_str())+" Can not init secure"; + } Marshal::FreeHGlobal(IntPtr(bufW)); return false; } @@ -238,7 +246,7 @@ CloseHandle(si.hStdOutput);si.hStdOutput=NULL; CloseHandle(si.hStdInput);si.hStdInput=NULL; - Sleep(CONST_SLEEP); //waiting for file + WaitForFile(oupath); if (!File::Exists(oupath)) { @@ -247,7 +255,7 @@ return false; } - Sleep(CONST_SLEEP); //waiting for closing all handles to this file + WaitForFile(oupath); Checker^ check=gcnew Tester::Checker(Path::GetFullPath(data->Checker),test->tests[index-1]->input,File::ReadAllText(oupath),test->tests[index-1]->output); @@ -367,3 +375,23 @@ { LeaveCriticalSection(cs); } + +void Runner::WaitForFile(String^ FileName) +{ + for (int i=0;i<CONST_SLEEP;++i) + if (!File::Exists(FileName)) + Sleep(1); + for (int i=0;i<CONST_SLEEP;++i) + { + try + { + FileStream^ f=File::OpenRead(FileName); + f->Close(); + break; + } catch(...) + { + Sleep(1); + continue; + } + } +} \ No newline at end of file Modified: ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.h =================================================================== --- ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.h 2008-09-01 16:43:21 UTC (rev 348) +++ ACMServer/trunk/sharp tester/SourceTest 2.0/Test/Test.h 2008-09-14 15:01:05 UTC (rev 349) @@ -79,6 +79,7 @@ void destroylock(); void lock(); //locks access to other theads void unlock(); //unlocks access to other threads + void WaitForFile(String^ FileName); //waits for file handle TestLoader^ testfield; DataLoader^ datafield; PluginLoader^ plugfield; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |