Merge pull request #635 from pseudonom/master

Changed installer to build from Ur/Web tip to fix socket errors

UrWeb/bench.ur

@@ -56,7 +56,7 @@ fun queries oqs =
 fun updates oqs =
   rows <- List.tabulateM (fn _ => n <- rand; world_find (clamp n)) (parseQueries oqs);
   rows' <- List.mapM (fn r => n <- rand; return (r -- #RandomNumber ++ {RandomNumber = clamp n})) rows;
-  u <- List.mapM (fn r => dml (UPDATE world SET RandomNumber = {[r.RandomNumber]} WHERE Id = {[r.Id]})) rows';
+  List.app (fn r => dml (UPDATE world SET RandomNumber = {[r.RandomNumber]} WHERE Id = {[r.Id]})) rows';
   returnJson rows'
 
 table fortune : {Id : int, Message : string} PRIMARY KEY Id

UrWeb/setup.py

@@ -10,7 +10,7 @@ def start(args, logfile, errfile):
                 'password=benchmarkdbpass '
                 'host=' + args.database_host)
   env = {'URWEB_PQ_CON': conn_string}
-  subprocess.Popen("./bench.exe -t " + threads,
+  subprocess.Popen("./bench.exe -k -t " + threads,
                    env=env, shell=True, cwd="UrWeb", stderr=errfile, stdout=logfile)
   return 0
 

toolset/setup/linux/installer.py

@@ -202,11 +202,11 @@ class Installer:
     # Ur/Web
     #
 
-    self.__download("http://www.impredicative.com/ur/urweb-20130421.tgz")
-    self.__run_command("tar xzf urweb-20130421.tgz")
-    self.__run_command("./configure", cwd="urweb-20130421")
-    self.__run_command("make", cwd="urweb-20130421")
-    self.__run_command("sudo make install", cwd="urweb-20130421")
+    self.__run_command("hg clone http://hg.impredicative.com/urweb/")
+    self.__run_command("./autogen.sh", cwd="urweb")
+    self.__run_command("./configure", cwd="urweb")
+    self.__run_command("make", cwd="urweb")
+    self.__run_command("sudo make install", cwd="urweb")
 
     #######################################
     # Webservers