Fix skip render in new wrapper (#94)

* Fix skip render in new wrapper

* Enable linux desktop worker

* Do not crash when log and PNG are here but GFZVK DONE is not in log

* Add STATUS file

Author: hevrard

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

@@ -55,12 +55,28 @@ def prepare_shader(shader):
 ################################################################################
 # Linux
 
-def run_linux(vert, frag, json):
+def run_linux(vert, frag, json, skip_render):
     assert(os.path.exists(vert))
     assert(os.path.exists(frag))
     assert(os.path.exists(json))
+
+    if skip_render:
+        with open('SKIP_RENDER', 'w') as f:
+            f.write('SKIP_RENDER')
+    elif os.path.exists('SKIP_RENDER'):
+        os.remove('SKIP_RENDER')
+
     cmd = 'vkworker ' + vert + ' ' + frag + ' ' + json + ' > ' + LOGFILE
-    subprocess.run(cmd, shell=True, timeout=TIMEOUT_RUN)
+    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
@@ -81,7 +97,7 @@ def adb(adbargs):
     else:
         return p
 
-def run_android(vert, frag, json):
+def run_android(vert, frag, json, skip_render):
     assert(os.path.exists(vert))
     assert(os.path.exists(frag))
     assert(os.path.exists(json))
@@ -91,6 +107,11 @@ def run_android(vert, frag, json):
     adb('push ' + vert + ' ' + ANDROID_SDCARD + '/test.vert.spv')
     adb('push ' + frag + ' ' + ANDROID_SDCARD + '/test.frag.spv')
     adb('push ' + json + ' ' + ANDROID_SDCARD + '/test.json')
+
+
+    if skip_render:
+        adb('shell touch ' + ANDROID_SDCARD + '/SKIP_RENDER')
+
     adb('logcat -c')
     adb('shell am start ' + ANDROID_APP + '/android.app.NativeActivity')
 
@@ -128,16 +149,18 @@ def run_android(vert, frag, json):
     # Grab log
     adb('logcat -d > ' + LOGFILE)
 
-    with open(LOGFILE, 'a') as f:
-        if done:
-            f.write('\nGFZVK DONE\n')
-        else:
-            # Something went wrong, make sure to stop the app in any case
-            adb('shell am force-stop ' + ANDROID_APP)
-            if crash:
-                f.write('\nGFZVK CRASH\n')
-            else:
-                f.write('\nGFZVK TIMEOUT\n')
+    status = 'SUCCESS'
+    if crash:
+        status = 'CRASH'
+    elif not done:
+        status = 'TIMEOUT'
+
+    with open('STATUS', 'w') as f:
+        f.write(status)
+
+    if status != 'SUCCESS':
+        # Something went wrong, make sure to stop the app in any case
+        adb('shell am force-stop ' + ANDROID_APP)
 
     # Grab image if present
     imagepath = ANDROID_SDCARD + '/image.png'
@@ -156,9 +179,11 @@ def run_android(vert, frag, json):
 
     group = parser.add_mutually_exclusive_group()
     group.add_argument('-a', '--android', action='store_true', help='Render on Android')
-    group.add_argument('-s', '--serial', help='Android device serial ID. Implies --android')
+    group.add_argument('-i', '--serial', help='Android device serial ID. Implies --android')
     group.add_argument('-l', '--linux', action='store_true', help='Render on Linux')
 
+    parser.add_argument('-s', '--skip-render', action='store_true', help='Skip render')
+
     parser.add_argument('vert', help='Vertex shader: shader.vert[.asm|.spv]')
     parser.add_argument('frag', help='Fragment shader: shader.frag[.asm|.spv]')
     parser.add_argument('json', help='Uniforms values')
@@ -170,10 +195,10 @@ def run_android(vert, frag, json):
 
     if args.serial:
         os.environ['ANDROID_SERIAL'] = args.serial
-        run_android(vert, frag, args.json)
+        run_android(vert, frag, args.json, args.skip_render)
 
     if args.android:
-        run_android(vert, frag, args.json)
+        run_android(vert, frag, args.json, args.skip_render)
 
     if args.linux:
-        run_linux(vert, frag, args.json)
+        run_linux(vert, frag, args.json, args.skip_render)

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

@@ -62,24 +62,6 @@ def remove(f):
 
 ################################################################################
 
-def adb(adbargs, serial=None):
-
-    adbcmd = 'adb'
-    if serial:
-        adbcmd += ' -s {}'.format(serial)
-
-    adbcmd += ' ' + adbargs
-
-    try:
-        p = subprocess.run(adbcmd, shell=True, timeout=TIMEOUT_ADB_CMD, stdout=subprocess.PIPE, universal_newlines=True)
-    except subprocess.TimeoutExpired as err:
-        print('ERROR: adb command timed out: ' + err.cmd)
-        return 1
-    else:
-        return p
-
-################################################################################
-
 def prepareVertFile():
     vertFilename = 'test.vert'
     vertFileDefaultContent = '''#version 310 es
@@ -175,50 +157,36 @@ def doImageJob(args, imageJob):
     remove(png)
     remove(log)
 
-    vkrun.run_android('test.vert.spv', 'test.frag.spv', 'test.json')
-
-    has_log = os.path.exists(log)
-    has_png = os.path.exists(png)
+    if args.linux:
+        vkrun.run_linux('test.vert.spv', 'test.frag.spv', 'test.json', skipRender)
+    else:
+        vkrun.run_android('test.vert.spv', 'test.frag.spv', 'test.json', skipRender)
 
-    if has_log:
+    if os.path.exists(log):
         with open(log, 'r') as f:
             res.log += f.read()
 
-    pngcontent = ''
-    if has_png:
+    if os.path.exists(png):
         with open(png, 'rb') as f:
-            pngcontent = f.read()
-
-    # Success
-    if has_log and has_png:
-        assert('GFZVK DONE' in res.log)
-        res.status = tt.JobStatus.SUCCESS
-        # may not have PNG when render_skip
-        if has_png:
-            res.PNG = pngcontent
-        return res
-
-    # Error
-    if has_log:
-
-        if 'GFZVK CRASH' in res.log:
+            res.PNG = f.read()
+
+    if os.path.exists('STATUS'):
+        with open('STATUS', 'r') as f:
+            status = f.read().rstrip()
+        if status == 'SUCCESS':
+            res.status = tt.JobStatus.SUCCESS
+        elif status == 'CRASH':
             res.status = tt.JobStatus.CRASH
-        elif 'GFZVK TIMEOUT' in res.log:
+        elif status == 'TIMEOUT':
             res.status = tt.JobStatus.TIMEOUT
         else:
+            res.log += '\nUnknown status value: ' + status + '\n'
             res.status = tt.JobStatus.UNEXPECTED_ERROR
+    else:
+        # Not even a status file?
+        res.log += '\nNo STATUS file\n'
+        res.status = tt.JobStatus.UNEXPECTED_ERROR
 
-        if has_png:
-            res.PNG = pngcontent
-
-        return res
-
-    # Unexpected error
-    res.status = tt.JobStatus.UNEXPECTED_ERROR
-    if has_png:
-        res.PNG = pngcontent
-    if not has_log:
-        res.log += 'Cannot even retrieve log?\n'
     return res
 
 ################################################################################
@@ -268,11 +236,17 @@ def get_service(server, args):
 
 ################################################################################
 
-def isDeviceOffline(serial):
-    devices = adb('devices').stdout.splitlines()
-    for d in devices:
-        if serial in d and 'offline' in d:
-            return True
+def isDeviceAvailable(serial):
+    cmd = 'adb devices'
+    devices = subprocess.run(cmd, shell=True, universal_newlines=True, stdout=subprocess.PIPE, timeout=2).stdout.splitlines()
+    for line in devices:
+        if serial in line:
+            l = line.split()
+            if l[1] == 'device':
+                return True
+            else:
+                return False
+    # Here the serial number was not present in `adb devices` output
     return False
 
 ################################################################################
@@ -288,6 +262,11 @@ def isDeviceOffline(serial):
     '--adbID',
     help='adb (Android Debug Bridge) ID of the device to run tests on. Run "adb devices" to list these IDs')
 
+parser.add_argument(
+    '--linux',
+    action='store_true',
+    help='Use Linux worker')
+
 parser.add_argument(
     '--server',
     default='http://localhost:8080',
@@ -304,24 +283,22 @@ def isDeviceOffline(serial):
 server = args.server + '/request'
 print('server: ' + server)
 
-# Set device ID
-if args.adbID:
-    os.environ['ANDROID_SERIAL'] = args.adbID
-else:
-    if 'ANDROID_SERIAL' not in os.environ:
-        print('Please set ANDROID_SERIAL env variable, or use --adbID')
-        exit(1)
-
-# Prepare device
-adb('shell mkdir -p /sdcard/graphicsfuzz/')
+if not args.linux:
+    # Set device ID
+    if args.adbID:
+        os.environ['ANDROID_SERIAL'] = args.adbID
+    else:
+        if 'ANDROID_SERIAL' not in os.environ:
+            print('Please set ANDROID_SERIAL env variable, or use --adbID')
+            exit(1)
 
 service = None
 
 # Main loop
 while True:
 
-    if isDeviceOffline(os.environ['ANDROID_SERIAL']):
-        print('#### ABORT: device is offline')
+    if not args.linux and not isDeviceAvailable(os.environ['ANDROID_SERIAL']):
+        print('#### ABORT: device {} is not available (either offline or not connected?)'.format(os.environ['ANDROID_SERIAL']))
         exit(1)
 
     if not(service):