Update compute.json and KVM API

Author: fwsGonzo

c/streaming.c

@@ -27,7 +27,7 @@ on_get(const char *url, const char *arg)
 
 int main(int argc, char **argv)
 {
-    if (strcmp(argv[0], "vmod_kvm"))
+    if (IS_LINUX_MAIN())
     {
         puts("Hello Linux World!");
         return 0;

compute.json

@@ -4,8 +4,7 @@
 		"max_boot_time": 8.0,
 		"max_request_time": 6.0,
 		"max_memory": 64,
-		"max_request_memory": 48,
-		"req_mem_limit_after_reset": 16 /* Mbytes */
+		"max_request_memory": 48
 	},
 	"avif": {
 		"group": "compute",
@@ -47,7 +46,7 @@
 		"uri": "https://filebin.varnish-software.com/tinykvm_programs/deflate.tar.xz",
 		"filename": "/tmp/compute_deflate",
 		"max_memory": 64,
-		"max_request_memory": 16,
+		"max_request_memory": 32,
 		"ephemeral": false,
 		"split_hugepages": false,
 		"hugepage_arena_size": 64,
@@ -72,6 +71,7 @@
 		"group": "compute",
 		"uri": "https://filebin.varnish-software.com/tinykvm_programs/gbcemu.tar.xz",
 		"filename": "/tmp/compute_gbcemu",
+		"key": "123",
 		"max_memory": 128,
 		"max_request_memory": 64,
 		"concurrency": 4,
@@ -91,7 +91,11 @@
 		"uri": "https://filebin.varnish-software.com/tinykvm_programs/hello_world.tar.xz",
 		"filename": "/tmp/compute_hello_world",
 		"concurrency": 2,
-		"storage": true
+		"storage": true,
+		"server": {
+			"port": 8081,
+			"systems": 64
+		}
 	},
 	"jsapp": {
 		"group": "compute",
@@ -144,8 +148,7 @@
 	},
 	"payload": {
 		"group": "compute",
-		//"uri": "https://filebin.varnish-software.com/tinykvm_programs/payload.tar.xz",
-		"uri": "file:///home/gonzo/github/kvm_demo/cpp/.build/payload",
+		"uri": "https://filebin.varnish-software.com/tinykvm_programs/payload.tar.xz",
 		"filename": "/tmp/compute_payload",
 		"max_memory": 128,
 		"max_request_memory": 80,
@@ -217,10 +220,13 @@
 	"webp": {
 		"group": "compute",
 		"uri": "https://filebin.varnish-software.com/tinykvm_programs/webpencoder.tar.xz",
+		"key": "123",
 		"filename": "/tmp/compute_webp",
 		"max_memory": 128,
 		"max_request_memory": 64,
-		"concurrency": 2
+		"concurrency": 2,
+		"ephemeral": false,
+		"hugepage_arena_size": 16
 	},
 	"xml": {
 		"group": "compute",
@@ -232,7 +238,8 @@
 	"zlibng": {
 		"group": "compute",
 		"uri": "https://filebin.varnish-software.com/tinykvm_programs/zlibng.tar.xz",
-		"filename": "/tmp/compute_zlibng"
+		"filename": "/tmp/compute_zlibng",
+		"ephemeral": false
 	},
 	"zstd": {
 		"group": "compute",

cpp/gbc/build_and_upload.sh

@@ -7,8 +7,9 @@ ninja
 popd
 
 file=".build/gbcemu"
-tenant="gameboy.com"
-key="12daf155b8508edc4a4b8002264d7494"
-host="https://sandbox.varnish-software.com"
+tenant="gbc"
+key="123"
+host="http://127.0.0.1:8080/update"
 
-curl -H "X-PostKey: $key" -H "Host: $tenant" --data-binary "@$file" -X POST $host
+set -x
+curl -D - -H "X-LiveUpdate: $key" -H "Host: $tenant" --data-binary "@$file" -X POST $host

cpp/src/hello_world.cpp

@@ -76,7 +76,7 @@ on_socket_prepare(int thread)
 
 int main(int argc, char **argv)
 {
-	Print("Hello Compute %s World!\n", argv[2]);
+	Print("Hello Compute %s World!\n", getenv("KVM_TYPE"));
 
 	set_backend_get(on_get);
 

kvm_api.h

@@ -46,12 +46,16 @@ extern "C" {
 extern void register_func(int, ...);
 
 /**
- * Detecting KVM from main(). Note that we could check CPUID, but we prefer
- * a simple check for / in argv[0].
+ * Detecting KVM from main(). Presence of environment variables,
+ * like KVM_NAME and KVM_TYPE, are used to determine if the
+ * program is running in a sandboxed environment.
 **/
 #define IS_SANDBOXED_MAIN()  (getenv("KVM_NAME") != (void*)0)
 #define IS_LINUX_MAIN()      !IS_SANDBOXED_MAIN()
-#define IS_STORAGE()         (strcmp(getenv("KVM_TYPE"), "storage") == 0)
+#define IS_STORAGE()		 (strcmp(getenv("KVM_TYPE"), "storage") == 0)
+#define IS_REQUEST()		 (strcmp(getenv("KVM_TYPE"), "request") == 0)
+#define IS_DEBUG()			 (strcmp(getenv("KVM_DEBUG"), "1") == 0)
+
 /**
  * During the start of the program, one should register callback functions
  * that will handle different types of requests, like GET, POST etc.

upload_programs.sh

@@ -45,6 +45,7 @@ upload_program cpp/.build/espeak
 upload_program cpp/.build/hello_world
 upload_program cpp/.build/fetch
 upload_program cpp/.build/minify
+upload_program cpp/.build/payload
 upload_program cpp/.build/to_string
 upload_program cpp/base64/.build/base64pp
 upload_program cpp/thumbnail/.build/thumbnails