Worker can now request compiles and report status.

Author: McLeopold

ants/engine.py

@@ -1,3 +1,3 @@
 @echo off
-playgame.py -r 1 -j -o viewer -t %2 -m %1 "python bots/python/HunterBot.py" "python bots/python/LeftyBot.py" "python bots/python/HunterBot.py" "python bots/python/LeftyBot.py"
+playgame.py -r 1 -j -o viewer -t 1000 -m maps/random4.txt "python bots/python/HunterBot.py" "python bots/python/LeftyBot.py" "python bots/python/HunterBot.py" "python bots/python/LeftyBot.py"
 

ants/play_one_game.cmd

@@ -1,2 +1,2 @@
-./playgame.py -r 1 -j -o viewer -t %2 -m %1 "python bots/python/HunterBot.py" "python bots/python/LeftyBot.py" "python bots/python/HunterBot.py" "python bots/python/LeftyBot.py"
+./playgame.py -r 1 -j -o viewer -t 1000 -m maps/random4.txt "python bots/python/HunterBot.py" "python bots/python/LeftyBot.py" "python bots/python/HunterBot.py" "python bots/python/LeftyBot.py"
 

ants/play_one_game.sh

@@ -5,9 +5,12 @@
 import time
 from optparse import OptionParser
 
-from engine import run_game
 from ants import Ants
 
+# get engine from worker dir
+sys.path.append("../worker")
+from engine import run_game
+
 def main(argv):
     usage ="Usage: %prog [options] map bot1 bot2\n\nYou must specify a map file."
     parser = OptionParser(usage=usage)
@@ -26,6 +29,9 @@ def main(argv):
     # it will also contain the bot input/output logs, if requested
     parser.add_option("-o", "--output_dir", dest="output_dir",
                       help="Directory to dump replay files to.")
+    parser.add_option("-j", "--output_json", dest="output_json",
+                      action="store_true", default=False,
+                      help="Return json result from engine.")
     parser.add_option("-I", "--log_input", dest="log_input",
                        action="store_true", default=False,
                        help="Log input streams sent to bots")
@@ -87,6 +93,7 @@ def main(argv):
             "map_file": opts.map,
             "turns": opts.turns,
             "output_dir": opts.output_dir,
+            "output_json": opts.output_json,
             "log_input": opts.log_input,
             "log_output": opts.log_output,
             "serial": opts.serial,
@@ -102,7 +109,9 @@ def main(argv):
                       (game.num_players, len(bots)))
                 break
             print('playgame round %s' % round)
-            run_game(game, bots, engine_options, round)
+            result = run_game(game, bots, engine_options, round)
+            if opts.output_json:
+                print result
 
     except Exception:
         traceback.print_exc()

ants/playgame.py

@@ -311,9 +311,9 @@ def compile_function(language, log):
 
 def get_programming_languages():
     connection = MySQLdb.connect(host = server_info["db_host"],
-                                                             user = server_info["db_username"],
-                                                             passwd = server_info["db_password"],
-                                                             db = server_info["db_name"])
+                                 user = server_info["db_username"],
+                                 passwd = server_info["db_password"],
+                                 db = server_info["db_name"])
     cursor = connection.cursor(MySQLdb.cursors.DictCursor)
     cursor.execute("SELECT * FROM language where language_id > 0")
     programming_languages = cursor.fetchall()
@@ -323,9 +323,10 @@ def get_programming_languages():
 
 # Autodetects the language of the entry in the current working directory and
 # compiles it.
-def compile_anything():
+def compile_anything(programming_languages=None):
     log = Log()
-    programming_languages = get_programming_languages()
+    if programming_languages == None:
+        programming_languages = get_programming_languages()
     detected_langs = [
         lang for lang in programming_languages \
             if os.path.exists(lang["main_code_file"])
@@ -366,7 +367,7 @@ def compile_anything():
     return log.out, log.err, language_id
 
 if __name__ == '__main__':
-    import cPickle
+    import json
     out, err, language_id = compile_anything()
-    print cPickle.dumps((out, err, language_id))
+    print json.dumps((out, err, language_id))
 

manager/compile_anything.py

@@ -34,8 +34,8 @@ def hash_file_md5sum(filename):
 def hash_file_sha(filename):
     READ_SIZE = 4096 * 2500
     fhash = sha1()
-    fhash.update(os.path.basename(filename))
-    f = open(filename, 'r')
+    #fhash.update(os.path.basename(filename))
+    f = open(filename, 'rb')
     content = f.read(READ_SIZE)
     while len(content) != 0:
         fhash.update(content)

manager/submission_hash.py

@@ -1 +1,2 @@
 server_info.php
+*.log

website/.gitignore

@@ -1,7 +1,11 @@
 <?php
+// ini_set('error_reporting', E_ALL);
+// ini_set('display_errors', true);
 
 require_once('api_functions.php');
 
+header("Content-type: application/json");
+
 $json_string = file_get_contents('php://input');
 $json_hash = md5($json_string);
 $compiledata = json_decode($json_string);
@@ -10,14 +14,18 @@
 	if (mysql_query(sprintf($sql["update_submission_success"],
 	                        $worker["worker_id"],
 	                        $compiledata->submission_id))) {
-		echo json_decode(array( "hash" => $json_hash ));
+		echo json_encode(array( "hash" => $json_hash ));
+	} else {
+		api_log(sprintf("Error updating successful compile: %s", mysql_error()));
 	}
 } else {
-	if (mysql_query(sprintf($sql["update_submission_failure"],
+	if (mysql_query(sprintf($sql["update_compile_result"],
 	                        $compiledata->status_id,
 	                        $worker["worker_id"],
 	                        $compiledata->submission_id))) {
-		echo json_decode(array( "hash" => $json_hash ));
+		echo json_encode(array( "hash" => $json_hash ));
+	} else {
+		api_log(sprintf("Error updating errored compile: %s", mysql_error()));
 	}
 }
 

website/api_compile_result.php

@@ -4,6 +4,7 @@
 
 require_once('memcache.php');
 require_once('mysql_login.php');
+require_once('server_info.php');
 
 if (!isset($_GET['api_key'])) {
     header('HTTP/1.0 401 Unauthorized');
@@ -55,4 +56,11 @@ function valid_worker($api_key,$ip_address) {
 	}	
 }
 
+function api_log($message) {
+	global $server_info;
+	$message = str_replace("\n", "", $message);
+	$message = str_replace("\r", "", $message);
+	$message = sprintf("%s - %s", date(DATE_ATOM), $message) . "\n";
+	error_log($message, 3, $server_info["api_log"]);
+}
 ?>

website/api_functions.php

@@ -0,0 +1,18 @@
+<?php
+// ini_set('error_reporting', E_ALL);
+// ini_set('display_errors', true);
+
+require_once('api_functions.php');
+
+header("Content-type: application/json");
+
+// look for compile task first
+$result = mysql_query($sql["select_languages"]);
+$languages = array();
+while ($row = mysql_fetch_assoc($result)) {
+	$languages[] = $row;
+}
+
+echo json_encode($languages);
+
+?>

website/api_get_languages.php

@@ -20,15 +20,15 @@
 
 // set correct content headers based on compression type
 if (file_exists("entry.zip")) {
-	header("Content-disposition: attachment; filename=$submission_id.zip");
+	header("Content-disposition: attachment; filename=entry.zip");
 	header("Content-type: application/zip");
 	$file = getcwd() . "/entry.zip";
 } else if (file_exists("entry.tgz")) {
-	header("Content-disposition: attachment; filename=$submission_id.tgz");
+	header("Content-disposition: attachment; filename=entry.tgz");
 	header("Content-type: application/x-compressed");
 	$file = getcwd() . "/entry.tgz";
 } else if (file_exists("entry.tar.gz")) {
-	header("Content-disposition: attachment; filename=$submission_id.tgz");
+	header("Content-disposition: attachment; filename=entry.tgz");
 	header("Content-type: application/x-compressed");
 	$file = getcwd() . "/entry.tar.gz";
 } else {