mirror of
https://github.com/libretro/RetroArch.git
synced 2025-04-02 10:51:52 -04:00
* workerized RA * Workerized (non-async) web player, using OPFS This patch eliminates the need for asyncify and uses modern filesystem APIs instead of the deprecated, unmaintained BrowserFS. This is a WIP patch because it won't fully work until these two Emscripten PRs land and are released: https://github.com/emscripten-core/emscripten/pull/23518 https://github.com/emscripten-core/emscripten/pull/23021 The former fixes an offscreen canvas context recreation bug, and the latter adds an equivalent to BrowserFS's XHR filesystem (but without the hazardous running-XHR-on-the-main-thread problem). The biggest issue is that local storage of users who were using the old version of the webplayer will be gone when they switch to the new webplayer. I don't have a good story for converting the old BrowserFS IDBFS contents into the new OPFS filesystem (the move is worth doing because OPFS supports seeking and reading only bits of a file, and because BrowserFS is dead). I've kept around the old libretro webplayer under pkg/emscripten/libretro-classic, and with these make flags you can build a non-workerized RA that uses asyncify to sleep as before: make -f Makefile.emscripten libretro=$CORE HAVE_WORKER=0 HAVE_WASMFS=0 PTHREAD=0 HAVE_AL=1 I also moved the default directory for core content on emscripten to not be a subdirectory of the local filesystem mount, because it's confusing to have a subdirectory that's lazily fetched and not mirrored to the local storage. I think it won't impact existing users of the classic web player because they already have a retroarch.cfg in place. * Get fetchfs working without manifest support * makefile fixes * fix scaling, remove zip dependency * Support asset/cheats/etc downloaders for emscripten - Add http transfer support for emscripten - At the task_http level, not the net_http level --- so no netplay or webdav. - Change default paths to be more like other platforms - Gives us smaller bundles and a faster boot time - Had to work around a task queue bug on Emscripten - I made the smallest possible change to do it, but it may be better to fix in rthread.c * Load an emscripten file_packager package on first run If no ozone assets are present, load a libretro_minimal package created using Emscripten's built-in file packager. * updated readme, removed indexer from wasmfs libretro-web * Put back zip dependency, load asset bundle into opfs on first run * fix upload path * Remove unused function * easy testing setup for two multithreaded conditions 1. make PROXY_TO_PTHREAD=1 (slower) 2. make PROXY_TO_PTHREAD=0 (bad audio, because doesn't sleep in openal.c) * Remove condition on sleep in openal also make input_driver check existence of drv->axis, drv->button before calling them. * Fix resizing under EGL * Don't force config file path on emscripten * Add time.h include to netplay, default HAVE_NETPLAYDISCOVERY to 0 * Remove nearly all proxied joypad calls under emscripten * Fix file uploads under firefox * Fix safari API uses, but Safari still hangs in OPFS filesystem mount I think this can be fixed by moving the backend creation off the main thread. * Move filesystem init into emscripten C entry point * Setup filesystems off of main thread * re-set default player to async Also improve Safari compatibility under proxy-to-pthread condition * Safari upload file fixes * Remove some excess prints * Fix typo
115 lines
3.7 KiB
C
115 lines
3.7 KiB
C
/* Copyright (C) 2010-2020 The RetroArch team
|
|
*
|
|
* ---------------------------------------------------------------------------------------
|
|
* The following license statement only applies to this file (retro_timers.h).
|
|
* ---------------------------------------------------------------------------------------
|
|
*
|
|
* Permission is hereby granted, free of charge,
|
|
* to any person obtaining a copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation the rights to
|
|
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
|
|
* and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
|
|
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#ifndef __LIBRETRO_COMMON_TIMERS_H
|
|
#define __LIBRETRO_COMMON_TIMERS_H
|
|
|
|
#include <stdint.h>
|
|
|
|
#if defined(XENON)
|
|
#include <time/time.h>
|
|
#elif !defined(__PSL1GHT__) && defined(__PS3__)
|
|
#include <sys/timer.h>
|
|
#elif defined(GEKKO) || defined(__PSL1GHT__) || defined(__QNX__)
|
|
#include <unistd.h>
|
|
#elif defined(WIIU)
|
|
#include <wiiu/os/thread.h>
|
|
#elif defined(PSP)
|
|
#include <pspthreadman.h>
|
|
#elif defined(VITA)
|
|
#include <psp2/kernel/threadmgr.h>
|
|
#elif defined(_3DS)
|
|
#include <3ds.h>
|
|
#elif (defined(EMSCRIPTEN) && defined(EMSCRIPTEN_ASYNCIFY))
|
|
#include <emscripten/emscripten.h>
|
|
#else
|
|
#include <time.h>
|
|
#endif
|
|
|
|
#if defined(_WIN32) && !defined(_XBOX)
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#include <windows.h>
|
|
#elif defined(_WIN32) && defined(_XBOX)
|
|
#include <Xtl.h>
|
|
#endif
|
|
|
|
#include <limits.h>
|
|
|
|
#ifdef _MSC_VER
|
|
#include <compat/msvc.h>
|
|
#endif
|
|
#include <retro_inline.h>
|
|
|
|
#ifdef DJGPP
|
|
#define timespec timeval
|
|
#define tv_nsec tv_usec
|
|
#include <unistd.h>
|
|
|
|
extern int nanosleep(const struct timespec *rqtp, struct timespec *rmtp);
|
|
|
|
static int nanosleepDOS(const struct timespec *rqtp, struct timespec *rmtp)
|
|
{
|
|
usleep(1000000L * rqtp->tv_sec + rqtp->tv_nsec / 1000);
|
|
|
|
if (rmtp)
|
|
rmtp->tv_sec = rmtp->tv_nsec=0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
#define nanosleep nanosleepDOS
|
|
#endif
|
|
|
|
/**
|
|
* Briefly suspends the running thread.
|
|
*
|
|
* @param msec The time to sleep for, in milliseconds.
|
|
**/
|
|
#if defined(VITA)
|
|
#define retro_sleep(msec) (sceKernelDelayThread(1000 * (msec)))
|
|
#elif defined(_3DS)
|
|
#define retro_sleep(msec) (svcSleepThread(1000000 * (s64)(msec)))
|
|
#elif defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
|
|
#define retro_sleep(msec) (SleepEx((msec), FALSE))
|
|
#elif defined(_WIN32)
|
|
#define retro_sleep(msec) (Sleep((msec)))
|
|
#elif defined(XENON)
|
|
#define retro_sleep(msec) (udelay(1000 * (msec)))
|
|
#elif !defined(__PSL1GHT__) && defined(__PS3__)
|
|
#define retro_sleep(msec) (sys_timer_usleep(1000 * (msec)))
|
|
#elif defined(GEKKO) || defined(__PSL1GHT__) || defined(__QNX__)
|
|
#define retro_sleep(msec) (usleep(1000 * (msec)))
|
|
#elif defined(WIIU)
|
|
#define retro_sleep(msec) (OSSleepTicks(ms_to_ticks((msec))))
|
|
#elif defined(EMSCRIPTEN) && defined(EMSCRIPTEN_ASYNCIFY)
|
|
#define retro_sleep(msec) (emscripten_sleep(msec))
|
|
#else
|
|
static INLINE void retro_sleep(unsigned msec)
|
|
{
|
|
struct timespec tv;
|
|
tv.tv_sec = msec / 1000;
|
|
tv.tv_nsec = (msec % 1000) * 1000000;
|
|
nanosleep(&tv, NULL);
|
|
}
|
|
#endif
|
|
|
|
#endif
|