Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-28 17:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix a possible dead-lock during closing.

Browse Source 
Update to actions/checkout@v6.
This commit is contained in:
Martín Lucas Golini
2026-04-21 00:20:39 -03:00
parent 7307b524f4
commit eec7eeb284
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/ecode-nightly.yml vendored
View File

@@ -18,7 +18,7 @@ jobs:
version: ${{ steps.tag.outputs.version }}
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with: { fetch-depth: 0, submodules: 'recursive' }
- name: Set Tag
id: tag
@@ -63,7 +63,7 @@ jobs:
apt-get update
apt-get install -y --no-install-recommends software-properties-common build-essential git ca-certificates
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with: { fetch-depth: 0, submodules: 'recursive', set-safe-directory: true }
- name: Set Environment Variables
run: |
@@ -122,7 +122,7 @@ jobs:
CXX: g++
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with: { fetch-depth: 0, submodules: 'recursive' }
- name: Set Environment Variables
run: |
@@ -182,7 +182,7 @@ jobs:
CXX: g++
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with: { fetch-depth: 0, submodules: 'recursive' }
- name: Set Environment Variables
run: |
@@ -232,7 +232,7 @@ jobs:
runs-on: ${{ matrix.config.container }}
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with: { fetch-depth: 0, submodules: 'recursive' }
- name: Set Environment Variables
run: |
@@ -278,7 +278,7 @@ jobs:
MACOS_TEAM_ID: ${{ secrets.MACOS_TEAM_ID }}
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with: { fetch-depth: 0, submodules: 'recursive' }
- name: System Information
run: |
@@ -338,7 +338,7 @@ jobs:
MACOS_TEAM_ID: ${{ secrets.MACOS_TEAM_ID }}
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with: { fetch-depth: 0, submodules: 'recursive' }
- name: System Information
run: |
@@ -391,7 +391,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with: { fetch-depth: 0, submodules: 'recursive' }
- name: Set Environment Variables
run: |
@@ -431,7 +431,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with: { fetch-depth: 0, submodules: 'recursive' }
- name: Set Environment Variables
run: |
@@ -472,7 +472,7 @@ jobs:
run: |
git config --system core.autocrlf false
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with: { fetch-depth: 0, submodules: 'recursive' }
- name: Build
shell: pwsh
@@ -501,7 +501,7 @@ jobs:
run: |
git config --system core.autocrlf false
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with: { fetch-depth: 0, submodules: 'recursive' }
- name: Build
shell: pwsh

2
.github/workflows/eepp-android-build-check.yml vendored
View File

@@ -6,7 +6,7 @@ jobs:
Android:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
submodules: recursive
- uses: actions/setup-java@v4

2
.github/workflows/eepp-ios-build-check.yml vendored
View File

@@ -6,7 +6,7 @@ jobs:
iOS:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
submodules: recursive
- name: Install dependencies

2
.github/workflows/eepp-linux-build-check.yml vendored
View File

@@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v6
with:
ref: ${{ github.ref }}
fetch-depth: 2

2
.github/workflows/eepp-macos-build-check.yml vendored
View File

@@ -7,7 +7,7 @@ jobs:
runs-on: macos-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v6
with:
ref: ${{ github.ref }}
fetch-depth: 2

2
.github/workflows/eepp-windows-build-check.yml vendored
View File

@@ -13,7 +13,7 @@ jobs:
run: |
git config --system core.autocrlf false
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v6
with:
ref: ${{ github.ref }}
fetch-depth: 2

3
include/eepp/scene/scenemanager.hpp
View File

@@ -37,8 +37,6 @@ class EE_API SceneManager {
void update();
bool isShuttingDown() const;
UISceneNode* getUISceneNode();
void setCurrentUISceneNode( UISceneNode* uiSceneNode );
@@ -48,7 +46,6 @@ class EE_API SceneManager {
protected:
Clock mClock;
UISceneNode* mUISceneNode;
bool mIsShuttingDown;
std::vector<SceneNode*> mSceneNodes;
};

9
include/eepp/system/singleton.hpp
View File

@@ -13,6 +13,8 @@
static T* createSingleton(); \
\
static T* existsSingleton(); \
\
static bool isShuttingDown(); \
\
static T* instance(); \
\
@@ -23,6 +25,7 @@
#define SINGLETON_DECLARE_IMPLEMENTATION( T ) \
\
static T* ms_singleton = NULL; \
static bool ms_is_shutting_down = false; \
static Mutex ms_mutex; \
\
T* T::createSingleton() { \
@@ -34,6 +37,10 @@
\
T* T::existsSingleton() { \
return ms_singleton; \
} \
\
bool T::isShuttingDown() { \
return ms_is_shutting_down; \
} \
\
T* T::instance() { \
@@ -41,8 +48,10 @@
} \
\
void T::destroySingleton() { \
ms_is_shutting_down = true; \
Lock l( ms_mutex ); \
eeSAFE_DELETE( ms_singleton ); \
ms_is_shutting_down = false; \
} \
\
void T::detachSingleton() { \

12
src/eepp/scene/scenemanager.cpp
View File

@@ -9,15 +9,13 @@ namespace EE { namespace Scene {
SINGLETON_DECLARE_IMPLEMENTATION( SceneManager )
bool SceneManager::isActive() {
return EE::Window::Engine::isEngineRunning() && SceneManager::existsSingleton() &&
!SceneManager::instance()->isShuttingDown();
return Engine::isEngineRunning() && SceneManager::existsSingleton() &&
!SceneManager::isShuttingDown();
}
SceneManager::SceneManager() : mUISceneNode( NULL ), mIsShuttingDown( false ) {}
SceneManager::SceneManager() : mUISceneNode( NULL ) {}
SceneManager::~SceneManager() {
mIsShuttingDown = true;
for ( auto& it : mSceneNodes ) {
SceneNode* node = it;
eeSAFE_DELETE( node );
@@ -60,10 +58,6 @@ void SceneManager::update() {
update( mClock.getElapsedTimeAndReset() );
}
bool SceneManager::isShuttingDown() const {
return mIsShuttingDown;
}
UISceneNode* SceneManager::getUISceneNode() {
if ( NULL == mUISceneNode ) {
for ( auto& sceneNode : mSceneNodes ) {

2
src/eepp/window/engine.cpp
View File

@@ -245,7 +245,7 @@ Uint32 Engine::getWindowCount() const {
}
bool Engine::isEngineRunning() {
return existsSingleton() && Engine::instance()->isRunning();
return existsSingleton() && !isShuttingDown() && Engine::instance()->isRunning();
}
bool Engine::isRunning() const {