fix linux

Author: smecsia

README.md

@@ -21,8 +21,9 @@ self-contained application file less than 4Mb in size.
 
 ## Drawbacks
 
-There is a `src/util` directory containing parts of a standard jdk source files + primitive thread pool implementation.
-The reason for this is that Avian does not implement many parts of a Java standard library.
+There is a `src/util` directory containing the primitive thread pool and blocking queue implementations, that
+should be easily found within the java standard library. The reason for this is that Avian does not implement 
+many parts of jdk and we have to "reinvent a wheel" for some features.
 
 ## Advanced settings
 
@@ -38,4 +39,9 @@ in the respective properties within `gradle.properties` file:
 ```properties
 OPEN_JDK_PATH=/absolute/path/to/openjdk/distribution
 OPEN_JDK_SRC_PATH=/absolute/path/to/openjdk/source/code
-```
+```
+
+## Drawbacks
+
+* The proven compatible version of OpenJDK is openjdk-7u111 (as of November 2016). Not sure if others will work as well.
+* The resulting size of a self-contained file will be tens of megabytes instead of a few.

avian.gradle

@@ -9,7 +9,8 @@ static platform() {
 }
 
 static arch() {
-    System.getProperty("os.arch")
+    final s = System.getProperty("os.arch")
+    s == "amd64" ? "x86_64" : s
 }
 
 static java_home() {
@@ -26,7 +27,7 @@ def avianBuildDir(File buildDir) {
 
 task standalone(dependsOn: 'shadowJar') {
     doLast {
-        if(!file("${buildDir}/avian").exists()){
+        if (!file("${buildDir}/avian").exists()) {
             exec {
                 commandLine 'git', 'clone', 'https://github.com/ReadyTalk/avian.git', "${buildDir}/avian"
             }
@@ -72,7 +73,7 @@ task standalone(dependsOn: 'shadowJar') {
         }
         exec {
             workingDir "${buildDir}/all"
-            commandLine '/bin/bash', '-c', "/usr/local/bin/g++ -rdynamic *.o -ldl -lpthread -lz -o ${project.name} -framework CoreFoundation"
+            commandLine '/bin/bash', '-c', "g++ -rdynamic *.o -ldl -lpthread -lz -o ${project.name} ${platform() == "macosx" ? '-framework CoreFoundation' : ''}"
         }
         exec {
             workingDir "${buildDir}/all"

build.gradle

@@ -14,6 +14,9 @@ buildscript {
 }
 repositories {
     mavenCentral()
+    maven {
+        url 'https://repository.jboss.org'
+    }
 }
 dependencies {
     testCompile 'junit:junit:4.12'

gradle.properties

@@ -1,4 +1,6 @@
 #OPEN_JDK_PATH=/Users/isadykov/Library/Java/JavaVirtualMachines/jdk1.7.0.jdk/Contents/Home/
 #OPEN_JDK_SRC_PATH=/Users/isadykov/dist/java/openjdk-1.7-src/jdk/src
+#OPEN_JDK_PATH=/usr/lib/jvm/java-7-openjdk-amd64
+#OPEN_JDK_SRC_PATH=/home/smecsia/dist/jdk/obuildfactory/sources/openjdk7/jdk/src
 OPEN_JDK_PATH=
 OPEN_JDK_SRC_PATH=

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Nov 14 19:59:48 AEDT 2016
+#Fri Nov 18 11:50:45 AEDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip

src/Main.kt

@@ -1,3 +1,4 @@
+import http.HttpHandler
 import http.HttpHandler.Companion.httpHandler
 import http.NioHttpServer
 

src/embedded-jar-main.cpp

@@ -1,4 +1,5 @@
 #include "jni.h"
+#include <stdint.h>
 #include "stdlib.h"
 
 #if (defined __MINGW32__) || (defined _MSC_VER)

src/http/NioHttpServer.kt

@@ -45,8 +45,13 @@ constructor(host: String = "0.0.0.0", port: Int = 8080,
     }
 
     private fun dispatch(key: SelectionKey) {
-        if (key.attachment() != null) {
-            (key.attachment() as Runnable).run()
+        when (key.attachment()) {
+            is Acceptor -> {
+                if (key.isAcceptable) {
+                    (key.attachment() as Acceptor).run()
+                }
+            }
+            else -> (key.attachment() as Runnable).run()
         }
     }
 

src/http/PooledHandler.kt

@@ -36,6 +36,8 @@ constructor(private val pool: ThreadPool,
                 handler.handle(requestBuffer.array(), sw)
                 socketChannel.write(wrap((sw.toString() as java.lang.String).bytes))
             }
+        } else if(readCount < 0) {
+            socketChannel.close()
         }
     }