mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-19 13:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipc/client: Start using Android-specific code if needed.

Browse source
This commit is contained in:
Ryan Pavlik 2020-11-09 15:24:39 -06:00 committed by Lubosz Sarnecki
parent 9c7cfa0229
commit da68bf502b
2 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/xrt/ipc/client/ipc_client.h
View file

@ -11,6 +11,7 @@
#pragma once
#include "xrt/xrt_compiler.h"
#include "xrt/xrt_config_os.h"
#include "shared/ipc_protocol.h"
#include "shared/ipc_utils.h"
@ -53,6 +54,10 @@ struct ipc_connection
struct os_mutex mutex;
#ifdef XRT_OS_ANDROID
struct ipc_client_android *ica;
#endif // XRT_OS_ANDROID
enum u_logging_level ll;
};

42
src/xrt/ipc/client/ipc_client_instance.c
View file

@ -10,6 +10,8 @@
#include "xrt/xrt_instance.h"
#include "xrt/xrt_gfx_native.h"
#include "xrt/xrt_handles.h"
#include "xrt/xrt_config_os.h"
#include "xrt/xrt_config_android.h"
#include "util/u_misc.h"
#include "util/u_var.h"
@ -34,6 +36,11 @@
#include "android/android_ahardwarebuffer_allocator.h"
#endif
#ifdef XRT_OS_ANDROID
#include "android/android_globals.h"
#include "android/ipc_client_android.h"
#endif // XRT_OS_ANDROID
DEBUG_GET_ONCE_LOG_OPTION(ipc_log, "IPC_LOG", U_LOGGING_WARN)
/*
@ -65,6 +72,35 @@ ipc_client_instance(struct xrt_instance *xinst)
return (struct ipc_client_instance *)xinst;
}
#ifdef XRT_OS_ANDROID
static bool
ipc_connect(struct ipc_connection *ipc_c)
{
ipc_c->ll = debug_get_log_option_ipc_log();
ipc_c->ica = ipc_client_android_create(android_globals_get_vm(),
android_globals_get_activity());
if (ipc_c->ica == NULL) {
IPC_ERROR(ipc_c, "Client create error!");
return false;
}
int socket = ipc_client_android_blocking_connect(ipc_c->ica);
if (socket < 0) {
IPC_ERROR(ipc_c, "Service Connect error!");
return false;
}
ipc_c->imc.socket_fd = socket;
ipc_c->imc.ll = ipc_c->ll;
return true;
}
#else
static bool
ipc_connect(struct ipc_connection *ipc_c)
{
@ -99,7 +135,7 @@ ipc_connect(struct ipc_connection *ipc_c)
return true;
}
#endif
/*
@ -179,6 +215,10 @@ ipc_client_instance_destroy(struct xrt_instance *xinst)
os_mutex_destroy(&ii->ipc_c.mutex);
#ifdef XRT_OS_ANDROID
ipc_client_android_destroy(&(ii->ipc_c.ica));
#endif
free(ii);
}