Skip to content

Add WHOA_SYSTEM_WEB support for Time and TLS #25

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

Open
atiernan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add WHOA_SYSTEM_WEB support for Time and TLS #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions common/Time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
#elif defined(WHOA_SYSTEM_MAC)
#include <mach/mach_time.h>
#include <unistd.h>
#elif defined(WHOA_SYSTEM_LINUX)
#elif defined(WHOA_SYSTEM_LINUX) || defined(WHOA_SYSTEM_WEB)
#include <chrono>
#endif

#if defined(WHOA_SYSTEM_LINUX)
#include <unistd.h>
#endif

Expand All @@ -25,7 +28,7 @@ uint64_t OsGetAsyncTimeMs() {

return ticks * (timebase.numer / timebase.denom) / 1000000;

#elif defined(WHOA_SYSTEM_LINUX)
#elif defined(WHOA_SYSTEM_LINUX) || defined(WHOA_SYSTEM_WEB)
auto now = std::chrono::steady_clock::now();
uint64_t ticks = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
return ticks;
Expand Down
10 changes: 5 additions & 5 deletions common/thread/OsTls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
#include <windows.h>
#endif

#if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX)
#if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX) || defined(WHOA_SYSTEM_WEB)
#include <storm/Array.hpp>
#include <storm/List.hpp>
#include <pthread.h>
#endif

#if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX)
#if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX) || defined(WHOA_SYSTEM_WEB)
typedef void* TLSData;

struct TLSSlot : public TSLinkedNode<TLSSlot> {
Expand All @@ -32,7 +32,7 @@ int32_t OsTlsAlloc() {
return TlsAlloc();
#endif

#if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX)
#if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX) || defined(WHOA_SYSTEM_WEB)
OsTls::s_tlsLock.Enter();

if (!OsTls::s_initialized) {
Expand All @@ -54,7 +54,7 @@ void* OsTlsGetValue(uint32_t tlsIndex) {
return TlsGetValue(tlsIndex);
#endif

#if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX)
#if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX) || defined(WHOA_SYSTEM_WEB)
if (!OsTls::s_initialized) {
return nullptr;
}
Expand Down Expand Up @@ -84,7 +84,7 @@ int32_t OsTlsSetValue(uint32_t tlsIndex, void* tlsValue) {
return TlsSetValue(tlsIndex, tlsValue);
#endif

#if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX)
#if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX) || defined(WHOA_SYSTEM_WEB)
if (!OsTls::s_initialized) {
return 0;
}
Expand Down