Report relevant worker info for vulkan worker (#99)

Author: hevrard

python/src/main/python/drivers/vkrun.py

@@ -78,6 +78,19 @@ def run_linux(vert, frag, json, skip_render):
     with open('STATUS', 'w') as f:
         f.write(status)
 
+def dump_info_linux():
+    cmd = 'vkworker --info'
+    status = 'SUCCESS'
+    try:
+        subprocess.run(cmd, shell=True, timeout=TIMEOUT_RUN).check_returncode()
+    except subprocess.TimeoutExpired as err:
+        status = 'TIMEOUT'
+    except subprocess.CalledProcessError as err:
+        status = 'CRASH'
+
+    with open('STATUS', 'w') as f:
+        f.write(status)
+
 ################################################################################
 # Android
 
@@ -163,11 +176,24 @@ def run_android(vert, frag, json, skip_render):
         adb('shell am force-stop ' + ANDROID_APP)
 
     # Grab image if present
-    imagepath = ANDROID_SDCARD + '/image.png'
+    imagepath = ANDROID_SDCARD + '/image_0.png'
     retcode = adb('shell test -f ' + imagepath).returncode
     if retcode == 0:
         adb('pull ' + imagepath)
 
+def dump_info_android():
+    infofile = ANDROID_SDCARD + '/worker_info.json'
+    adb('shell rm -f ' + infofile)
+    adb('shell am force-stop ' + ANDROID_APP)
+    adb('shell am start -n ' + ANDROID_APP + '/android.app.NativeActivity -e gfz "\"--info\""')
+    deadline = time.time() + 1
+    while time.time() < deadline:
+        retcode = adb('shell test -f ' + infofile).returncode
+        if retcode == 0:
+            adb('pull ' + infofile)
+        time.sleep(0.1)
+    adb('shell am force-stop ' + ANDROID_APP)
+
 ################################################################################
 # Main
 

python/src/main/python/drivers/worker_vk.py

@@ -106,7 +106,7 @@ def doImageJob(args, imageJob):
     name = imageJob.name.replace('.frag','')
     fragFile = name + '.frag'
     jsonFile = name + '.json'
-    png = 'image.png'
+    png = 'image_0.png'
     log = 'vklog.txt'
 
     res = tt.ImageJobResult()
@@ -191,7 +191,7 @@ def doImageJob(args, imageJob):
 
 ################################################################################
 
-def get_service(server, args):
+def get_service(server, args, worker_info_json_string):
     try:
         httpClient = THttpClient.THttpClient(server)
         transport = TTransport.TBufferedTransport(httpClient)
@@ -200,14 +200,7 @@ def get_service(server, args):
         transport.open()
 
         # Get token
-
-        # TODO: grab information from worker
-
-        platforminfo = '''
-        {
-          "clientplatform": "Wrapper on vulkan"
-        }
-        '''
+        platforminfo = worker_info_json_string
 
         tryToken = args.token
         print("Call getToken()")
@@ -294,6 +287,21 @@ def isDeviceAvailable(serial):
 
 service = None
 
+# Get worker info
+worker_info_file = 'worker_info.json'
+remove(worker_info_file)
+
+if args.linux:
+    vkrun.dump_info_linux()
+else:
+    vkrun.dump_info_android()
+
+assert(os.path.exists(worker_info_file))
+
+worker_info_json_string = '{}'  # Dummy but valid JSON string
+with open(worker_info_file, 'r') as f:
+    worker_info_json_string = f.read()
+
 # Main loop
 while True:
 
@@ -302,7 +310,7 @@ def isDeviceAvailable(serial):
         exit(1)
 
     if not(service):
-        service, token = get_service(server, args)
+        service, token = get_service(server, args, worker_info_json_string)
 
         if not(service):
             print("Cannot connect to server, retry in a second...")