Skip to content

Commit

Permalink
Debug runtime crash
Browse files Browse the repository at this point in the history
  • Loading branch information
niranjanyardi committed Feb 7, 2025
1 parent 972673e commit e0b56a1
Show file tree
Hide file tree
Showing 5 changed files with 208 additions and 192 deletions.
6 changes: 6 additions & 0 deletions starboard/common/test_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@

#include "build/build_config.h"
#include "starboard/client_porting/wrap_main/wrap_main.h"
#include "starboard/common/log.h"
#include "starboard/event.h"
#include "starboard/system.h"
#include "testing/gtest/include/gtest/gtest.h"

namespace {
int InitAndRunAllTests(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv);
SB_LOG(INFO) << "In InitAndRunAllTests";
return RUN_ALL_TESTS();
}
} // namespace
Expand All @@ -31,6 +33,8 @@ int InitAndRunAllTests(int argc, char** argv) {
// For the Starboard OS define SbEventHandle as the entry point
SB_EXPORT STARBOARD_WRAP_SIMPLE_MAIN(InitAndRunAllTests);

#if !defined(IS_COBALT_HERMETIC_BUILD)

#if !SB_IS(EVERGREEN)
// Define main() for non-Evergreen Starboard OS.
int main(int argc, char** argv) {
Expand All @@ -42,4 +46,6 @@ int main(int argc, char** argv) {
int main(int argc, char** argv) {
return InitAndRunAllTests(argc, argv);
}

#endif // !defined(IS_COBALT_HERMETIC_BUILD)
#endif // BUILDFLAG(IS_STARBOARD)
1 change: 1 addition & 0 deletions starboard/linux/x64x11/run_starboard_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "starboard/shared/x11/application_x11.h"

int SbRunStarboardMain(int argc, char** argv, SbEventHandleCallback callback) {
SB_LOG(INFO) << "SbRunStarboardMain loader";
starboard::shared::x11::ApplicationX11 application(callback);
int result = 0;
{
Expand Down
5 changes: 5 additions & 0 deletions starboard/linux/x64x11/starboard_loader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@ int main(int argc, char** argv) {
void* handle_ = dlopen(s_target_lib_path, RTLD_LAZY);
if (!handle_) {
std::cerr << "dlopen failure: " << dlerror() << std::endl;
} else {
printf("loaded SB_LOADER_MODULE module succcessfully \n");
}

void* callback = nullptr;
callback = dlsym(handle_, "SbEventHandle");
if (!callback) {
std::cerr << "dlsym failure: " << dlerror() << std::endl;
} else {
printf("loaded SbEventHandle succcessfully\n");
}

return SbRunStarboardMain(argc, argv,
reinterpret_cast<SbEventHandleCallback>(callback));
}
Loading

0 comments on commit e0b56a1

Please sign in to comment.