瀏覽代碼

small updates and re-configuration

weltermann17 11 年之前
父節點
當前提交
49f3da3eb4
共有 3 個文件被更改,包括 3 次插入5 次删除
  1. 2 4
      plain/build.sbt
  2. 二進制
      plain/lib/plain-library_2.10-1.0.1-SNAPSHOT.jar
  3. 1 1
      plain/setup.py

+ 2 - 4
plain/build.sbt

@@ -31,7 +31,6 @@ libraryDependencies ++= Seq(
   "com.typesafe" % "config" % "1.0.2",
   "ch.qos.logback" % "logback-classic" % "1.0.13",
   "org.codehaus.janino" % "janino" % "2.6.1",
-  "com.lmax" % "disruptor" % "3.2.0",
   "com.typesafe.akka" %% "akka-actor" % "2.2.3",
   "com.typesafe.akka" %% "akka-slf4j" % "2.2.3",
   "org.apache.commons" % "commons-lang3" % "3.1",
@@ -41,12 +40,11 @@ libraryDependencies ++= Seq(
   "commons-codec" % "commons-codec" % "1.8",
   "javax.servlet" % "javax.servlet-api" % "3.1.0",
   "org.glassfish.web" % "javax.servlet.jsp" % "2.3.1",
-  "com.googlecode.concurrentlinkedhashmap" % "concurrentlinkedhashmap-lru" % "1.3.2",
+  "com.googlecode.concurrentlinkedhashmap" % "concurrentlinkedhashmap-lru" % "1.4",
   "net.jpountz.lz4" % "lz4" % "1.2.0",
   "net.lingala.zip4j" % "zip4j" % "1.3.1", 
-  "com.fasterxml.jackson.core" % "jackson-databind" % "2.2.3",
+  "com.fasterxml.jackson.core" % "jackson-databind" % "2.3.0",
   "com.sun.jersey" % "jersey-json" % "1.17.1",
-  "org.jvnet.mimepull" % "mimepull" % "1.9.3",
   "mysql" % "mysql-connector-java" % "5.1.27"
 )
 

二進制
plain/lib/plain-library_2.10-1.0.1-SNAPSHOT.jar


+ 1 - 1
plain/setup.py

@@ -11,7 +11,7 @@ def start(args, logfile, errfile):
   else:
     subprocess.check_call("./sbt assembly && rm -rf target/scala-2.10/cache", shell=True, cwd="plain", stderr=errfile, stdout=logfile)
 
-  subprocess.Popen("java -server -da -dsa -Xrs -Xmx6g -Xmn4g -Xss8m -Xnoclassgc -XX:MaxPermSize=1g -XX:ReservedCodeCacheSize=384m -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -jar target/scala-2.10/plain-benchmark-assembly-1.0.1.jar", cwd="plain", shell=True, stderr=errfile, stdout=logfile)
+  subprocess.Popen("java -jar target/scala-2.10/plain-benchmark-assembly-1.0.1.jar", cwd="plain", shell=True, stderr=errfile, stdout=logfile)
   time.sleep(10)
   return 0