Skip to content

Control jvm thread on our side #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 1, 2022
Merged

Control jvm thread on our side #26

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca47fd3
control jvm thread on defold side
AGulev Aug 31, 2022
03eca0c
undef
AGulev Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions firebase_analytics/src/firebase_analytics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

#if defined(DM_PLATFORM_ANDROID) || defined(DM_PLATFORM_IOS)

#include <dmsdk/dlib/android.h>

#include "firebase/app.h"
#include "firebase/analytics.h"
#include "firebase/analytics/event_names.h"
Expand All @@ -27,9 +29,11 @@ void FirebaseAnalytics_Safe_LogEvent(lua_State*, const char* name, const firebas
{
LogEvent(name, params, number_of_parameters);
}
#define THREAD_ATTACHER() dmAndroid::ThreadAttacher threadAttacher;
#else
#define THREAD_ATTACHER()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This define helps to avoid multiple #if defined(DM_PLATFORM_ANDROID) checks and makes code clear

#endif


static int FirebaseAnalytics_Init(lua_State* L) {
DM_LUA_STACK_CHECK(L, 0);
const firebase::App* app = Firebase_GetFirebaseApp();
Expand Down Expand Up @@ -93,6 +97,7 @@ static int FirebaseAnalytics_Analytics_Log(lua_State* L) {
return 0;
}
const char* name = luaL_checkstring(L, 1);
THREAD_ATTACHER();
LogEvent(name);
return 0;
}
Expand All @@ -107,6 +112,7 @@ static int FirebaseAnalytics_Analytics_LogString(lua_State* L) {
const char* name = luaL_checkstring(L, 1);
const char* parameter_name = luaL_checkstring(L, 2);
const char* parameter_value = luaL_checkstring(L, 3);
THREAD_ATTACHER();
LogEvent(name, parameter_name, parameter_value);
return 0;
}
Expand All @@ -121,6 +127,7 @@ static int FirebaseAnalytics_Analytics_LogInt(lua_State* L) {
const char* name = luaL_checkstring(L, 1);
const char* parameter_name = luaL_checkstring(L, 2);
const int parameter_value = luaL_checkint(L, 3);
THREAD_ATTACHER();
LogEvent(name, parameter_name, parameter_value);
return 0;
}
Expand All @@ -135,6 +142,7 @@ static int FirebaseAnalytics_Analytics_LogNumber(lua_State* L) {
const char* name = luaL_checkstring(L, 1);
const char* parameter_name = luaL_checkstring(L, 2);
const lua_Number parameter_value = luaL_checknumber(L, 3);
THREAD_ATTACHER();
LogEvent(name, parameter_name, parameter_value);
return 0;
}
Expand Down Expand Up @@ -189,7 +197,7 @@ static int FirebaseAnalytics_Analytics_LogTable(lua_State* L) {
lua_pop(L, 1);
++size;
}

THREAD_ATTACHER();
FirebaseAnalytics_Safe_LogEvent(L, name, params, size);

lua_pop(L, 1);
Expand All @@ -203,6 +211,7 @@ static int FirebaseAnalytics_Analytics_Reset(lua_State* L) {
dmLogWarning("Firebase Analytics has not been initialized! Make sure to call firebase.analytics.init().");
return 0;
}
THREAD_ATTACHER();
ResetAnalyticsData();
return 0;
}
Expand All @@ -215,6 +224,7 @@ static int FirebaseAnalytics_Analytics_SetEnabled(lua_State* L) {
return 0;
}
int enabled = lua_toboolean(L, 1);
THREAD_ATTACHER();
SetAnalyticsCollectionEnabled((bool)enabled);
return 0;
}
Expand All @@ -233,6 +243,7 @@ static int FirebaseAnalytics_Analytics_SetUserProperty(lua_State* L) {
}
const char* name = luaL_checkstring(L, 1);
const char* property = luaL_checkstring(L, 2);
THREAD_ATTACHER();
SetUserProperty(name, property);
return 0;
}
Expand All @@ -245,6 +256,7 @@ static int FirebaseAnalytics_Analytics_SetUserId(lua_State* L) {
return 0;
}
const char* user_id = luaL_checkstring(L, 1);
THREAD_ATTACHER();
SetUserId(user_id);
return 0;
}
Expand Down Expand Up @@ -397,7 +409,7 @@ static void LuaInit(lua_State* L) {

lua_pop(L, 1); // pop "firebase" global table
}

#undef THREAD_ATTACHER()
#endif

dmExtension::Result AppInitializeFirebaseAnalyticsExtension(dmExtension::AppParams* params) {
Expand Down