[WIP] (MG_Remote): implement P6.5 TCP and stream transport

This commit is contained in:
2026-09-22 07:19:18 -04:00
parent 810b9b7a9f
commit 52ffc6a7f2
68 changed files with 4934 additions and 928 deletions
+14 -1
View File
@@ -319,6 +319,8 @@ else()
endif()
enable_testing()
set(MOBILEGL_TRACE_TCP_ENDPOINT "" CACHE STRING "Optional TCP supervisor endpoint for the CI split trace subset")
set(MOBILEGL_TRACE_TCP_TOKEN "" CACHE STRING "Token for the TCP trace supervisor")
function(add_trace_replay_test CASE_NAME BACKEND)
set(oneValueArgs
TRACE_ARCHIVE
@@ -340,7 +342,9 @@ function(add_trace_replay_test CASE_NAME BACKEND)
# entry is a second arm of.
VARIANT
TRANSPORT
IPC_SERVER_PATH)
IPC_SERVER_PATH
IPC_CONTROL
IPC_TOKEN)
cmake_parse_arguments(TRACE_CASE "" "${oneValueArgs}" "" ${ARGN})
foreach(required TRACE_ARCHIVE GOLDEN TARGET_CALL WIDTH HEIGHT)
if(NOT TRACE_CASE_${required})
@@ -417,6 +421,8 @@ function(add_trace_replay_test CASE_NAME BACKEND)
-DTRACE_COHERENT_AS_FLUSH=${TRACE_CASE_COHERENT_AS_FLUSH}
-DTRACE_TRANSPORT=${TRACE_CASE_TRANSPORT}
-DTRACE_IPC_SERVER_PATH=${TRACE_CASE_IPC_SERVER_PATH}
-DTRACE_IPC_CONTROL=${TRACE_CASE_IPC_CONTROL}
-DTRACE_IPC_TOKEN=${TRACE_CASE_IPC_TOKEN}
-DTRACE_OUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}/${CASE_NAME}/${trace_case_output_tag}
-DTRACE_ARTIFACT_DIR=${CMAKE_CURRENT_BINARY_DIR}/${CASE_NAME}/${trace_case_artifact_tag}
-P ${MOBILEGL_TRACE_ROOT}/run_trace_case.cmake)
@@ -440,6 +446,9 @@ function(add_trace_replay_test CASE_NAME BACKEND)
ENVIRONMENT "LIBGL_ALWAYS_SOFTWARE=1;MESA_GL_VERSION_OVERRIDE=3.3;MESA_GLSL_VERSION_OVERRIDE=330"
LABELS "${trace_case_labels}")
endif()
if(TRACE_CASE_IPC_CONTROL)
set_tests_properties(${trace_case_name} PROPERTIES RESOURCE_LOCK mobilegl-tcp-trace)
endif()
endfunction()
function(add_trace_replay_test_for_backends CASE_NAME)
@@ -491,6 +500,10 @@ function(add_trace_replay_split_test CASE_NAME)
IPC_SERVER_PATH "${CMAKE_BINARY_DIR}/libMobileGLServer.so" ${ARGN})
add_trace_replay_test(${CASE_NAME} ${backend} VARIANT SPAWN TRANSPORT spawn
IPC_SERVER_PATH "${CMAKE_BINARY_DIR}/libMobileGLServer.so" ${ARGN})
if(MOBILEGL_TRACE_TCP_ENDPOINT)
add_trace_replay_test(${CASE_NAME} ${backend} VARIANT TCP TRANSPORT spawn
IPC_CONTROL "${MOBILEGL_TRACE_TCP_ENDPOINT}" IPC_TOKEN "${MOBILEGL_TRACE_TCP_TOKEN}" ${ARGN})
endif()
endforeach()
endfunction()
+18 -1
View File
@@ -51,6 +51,13 @@ if(DEFINED TRACE_IPC_SERVER_PATH AND NOT "${TRACE_IPC_SERVER_PATH}" STREQUAL "")
# "parsed and ignored" stop being the same observation.
set(ENV{MOBILEGL_IPC_SERVER_PATH} "${TRACE_IPC_SERVER_PATH}")
endif()
if(DEFINED TRACE_IPC_CONTROL AND NOT "${TRACE_IPC_CONTROL}" STREQUAL "")
set(ENV{MOBILEGL_IPC_CONTROL} "${TRACE_IPC_CONTROL}")
set(ENV{MOBILEGL_IPC_DATA} stream)
set(ENV{MOBILEGL_IPC_TOKEN} "${TRACE_IPC_TOKEN}")
set(ENV{MOBILEGL_IPC_REQUIRE_SAME_BUILD} 1)
set(ENV{MOBILEGL_IPC_LOG_FORWARD} 1)
endif()
if(EXISTS "${TRACE_OUTPUT_DIR}")
file(REMOVE_RECURSE "${TRACE_OUTPUT_DIR}")
@@ -294,7 +301,17 @@ if(DEFINED ENV{MOBILEGL_TRANSPORT} AND NOT "$ENV{MOBILEGL_TRANSPORT}" STREQUAL "
set(split_expected_marker "MOBILEGL_TRANSPORT=inproc - the MGPipe record stream")
elseif("$ENV{MOBILEGL_TRANSPORT}" STREQUAL "spawn")
set(split_expected_marker "MOBILEGL_TRANSPORT=spawn - the MGPipe record stream")
set(split_expected_second "spawn ARMED - the server role runs in pid ")
if("$ENV{MOBILEGL_IPC_CONTROL}" MATCHES "^tcp://")
set(split_expected_second "control=tcp data=stream server=")
if(NOT split_log MATCHES "control=tcp data=stream server=[^ \r\n]+ pid=[1-9][0-9]*")
message(FATAL_ERROR "${split_case}: TCP session has no endpoint and server pid arm proof")
endif()
if(NOT EXISTS "${mobilegl_server_log}")
message(FATAL_ERROR "${split_case}: TCP session has no forwarded server log")
endif()
else()
set(split_expected_second "spawn ARMED - the server role runs in pid ")
endif()
else()
message(FATAL_ERROR
"MOBILEGL_TRANSPORT=$ENV{MOBILEGL_TRANSPORT} is set for ${split_case} and this "
+36
View File
@@ -0,0 +1,36 @@
#!/usr/bin/env python3
"""Start or stop the trace APK's foreground TCP supervisor through adb."""
import argparse
import shlex
import subprocess
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('action', choices=('start', 'stop'))
parser.add_argument('--adb', default='adb')
parser.add_argument('--serial', default='2f7cbe2e')
parser.add_argument('--package', default='top.mobilegl.plugin.trace')
parser.add_argument('--listen', default='tcp://127.0.0.1:40613')
parser.add_argument('--token', default='')
parser.add_argument('--env', action='append', default=[], help='KEY=VALUE;KEY overrides (repeatable)')
parser.add_argument('--forward', action='store_true', help='Forward local adb port 40613 to the device')
args = parser.parse_args()
adb = [args.adb, '-s', args.serial]
if args.action == 'stop':
command = ['am', 'force-stop', args.package]
else:
command = ['am', 'start-foreground-service', '-n', args.package + '/top.mobilegl.plugin.MobileGLServerService',
'--es', 'listen', args.listen, '--es', 'token', args.token,
'--es', 'env', ';'.join(args.env)]
subprocess.run(adb + ['shell', shlex.join(command)], check=True)
if args.action == 'start' and args.forward:
subprocess.run(adb + ['forward', 'tcp:40613', 'tcp:40613'], check=True)
if args.action == 'start':
print('Read readiness: adb -s ' + args.serial + ' logcat -s MobileGLServer')
print('Client: MOBILEGL_TRANSPORT=spawn MOBILEGL_IPC_DATA=stream '
'MOBILEGL_IPC_REQUIRE_SAME_BUILD=1 MOBILEGL_IPC_CONTROL=tcp://<device-address>:40613')
if __name__ == '__main__':
main()