korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-29 23:24:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

android: Fix enabling debug logs when running under Valgrind

Browse Source
This commit is contained in:
Szymon Janc 2014-03-10 11:57:40 +01:00
parent d19b133b1d
commit 4258f08333
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
android/bluetoothd-wrapper.c
View File

@ -32,15 +32,17 @@
#define BLUETOOTHD_BIN "/system/bin/bluetoothd-main"
static void run_valgrind(void)
static void run_valgrind(int debug, int mgmt_dbg)
{
char *prg_argv[4];
char *prg_argv[6];
char *prg_envp[3];
prg_argv[0] = VALGRIND_BIN;
prg_argv[1] = "--leak-check=full";
prg_argv[2] = BLUETOOTHD_BIN;
prg_argv[3] = NULL;
prg_argv[3] = debug ? "-d" : NULL;
prg_argv[4] = mgmt_dbg ? "--mgmt-debug" : NULL;
prg_argv[5] = NULL;
prg_envp[0] = "G_SLICE=always-malloc";
prg_envp[1] = "G_DEBUG=gc-friendly";
@ -70,10 +72,6 @@ int main(int argc, char *argv[])
int debug = 0;
int mgmt_dbg = 0;
if (property_get(PROPERTY_VALGRIND_NAME, value, "") > 0 &&
(!strcasecmp(value, "true") || atoi(value) > 0))
run_valgrind();
if (property_get(PROPERTY_DEBUG_NAME, value, "") > 0 &&
(!strcasecmp(value, "true") || atoi(value) > 0))
debug = 1;
@ -84,6 +82,10 @@ int main(int argc, char *argv[])
mgmt_dbg = 1;
}
if (property_get(PROPERTY_VALGRIND_NAME, value, "") > 0 &&
(!strcasecmp(value, "true") || atoi(value) > 0))
run_valgrind(debug, mgmt_dbg);
/* In case we failed to execute Valgrind, try to run bluetoothd
* without it
*/