mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2025-06-20 18:32:39 +02:00
b7ec64ea16
Starting in 20.0.0, the browser needs more applet memory to function, so we can't steal as much any more.
Thus, we now steal 14 MB on 20.0.0+ instead of 40MB.
However, since this reduces memory available for custom system modules, we are adjusting to compensate.
ams.mitm's heap size has been reduced from 32MB to 12MB (recovering 20MB).
In addition, fs.mitm now uses a new mechanism for stealing memory from the applet pool while romfs is being built.
On net, we are compromising:
* Custom sysmodules lose memory available to them.
On 19.0.0/AMS 1.8.0, there was 30 MB available for custom sysmodules.
Stealing 14 MB instead of 40 MB, we lose 26 MB of that. Reducing ams.mitm's usage will gain us back 20.
Nintendo also appears to...use 4 extra MB, in 20.0.0, from my test homebrew.
So on 20.0.0/AMS 1.9.0, there should be 20 MB available for custom sysmodules.
On the bright side, on <20.0.0/AMS 1.9.0, I guess there will be 50 MB available for custom sysmodules now?
* totk mods will lose the ability to...put every file in the romfs on sd card. There will be some unknown maximum filecount for totk mods.
On the bright side, implementing the transient memory stealing should improve compatibility for some mods which strictly add files?
66 lines
1.4 KiB
C
66 lines
1.4 KiB
C
#pragma once
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#include <switch/types.h>
|
|
#include <switch/result.h>
|
|
#include <switch/kernel/mutex.h>
|
|
#include <switch/sf/service.h>
|
|
#include <switch/services/sm.h>
|
|
|
|
typedef struct ServiceGuard {
|
|
Mutex mutex;
|
|
u32 refCount;
|
|
} ServiceGuard;
|
|
|
|
NX_INLINE bool serviceGuardBeginInit(ServiceGuard* g)
|
|
{
|
|
mutexLock(&g->mutex);
|
|
return (g->refCount++) == 0;
|
|
}
|
|
|
|
NX_INLINE Result serviceGuardEndInit(ServiceGuard* g, Result rc, void (*cleanupFunc)(void))
|
|
{
|
|
if (R_FAILED(rc)) {
|
|
cleanupFunc();
|
|
--g->refCount;
|
|
}
|
|
mutexUnlock(&g->mutex);
|
|
return rc;
|
|
}
|
|
|
|
NX_INLINE void serviceGuardExit(ServiceGuard* g, void (*cleanupFunc)(void))
|
|
{
|
|
mutexLock(&g->mutex);
|
|
if (g->refCount && (--g->refCount) == 0)
|
|
cleanupFunc();
|
|
mutexUnlock(&g->mutex);
|
|
}
|
|
|
|
#define NX_GENERATE_SERVICE_GUARD_PARAMS(name, _paramdecl, _parampass) \
|
|
\
|
|
static ServiceGuard g_##name##Guard; \
|
|
NX_INLINE Result _##name##Initialize _paramdecl; \
|
|
static void _##name##Cleanup(void); \
|
|
\
|
|
Result name##Initialize _paramdecl \
|
|
{ \
|
|
Result rc = 0; \
|
|
if (serviceGuardBeginInit(&g_##name##Guard)) \
|
|
rc = _##name##Initialize _parampass; \
|
|
return serviceGuardEndInit(&g_##name##Guard, rc, _##name##Cleanup); \
|
|
} \
|
|
\
|
|
void name##Exit(void) \
|
|
{ \
|
|
serviceGuardExit(&g_##name##Guard, _##name##Cleanup); \
|
|
}
|
|
|
|
#define NX_GENERATE_SERVICE_GUARD(name) NX_GENERATE_SERVICE_GUARD_PARAMS(name, (void), ())
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|