refactored and fixed crash bug, some memleaks
This commit is contained in:
parent
30cdbff8a6
commit
53cc45e7e1
285
AMBuildScript
285
AMBuildScript
@ -26,8 +26,9 @@ class AsyncSocketConfig(object):
|
||||
def __init__(self):
|
||||
self.sdks = {}
|
||||
self.binaries = []
|
||||
self.sm_root = None
|
||||
self.extensions = []
|
||||
self.generated_headers = None
|
||||
self.sm_root = None
|
||||
|
||||
@property
|
||||
def tag(self):
|
||||
@ -39,160 +40,179 @@ class AsyncSocketConfig(object):
|
||||
if builder.options.sm_path:
|
||||
self.sm_root = builder.options.sm_path
|
||||
else:
|
||||
self.sm_root = ResolveEnvPath('SOURCEMOD17', 'sourcemod-1.7')
|
||||
self.sm_root = ResolveEnvPath('SOURCEMOD18', 'sourcemod-1.8')
|
||||
if not self.sm_root:
|
||||
self.sm_root = ResolveEnvPath('SOURCEMOD', 'sourcemod')
|
||||
if not self.sm_root:
|
||||
self.sm_root = ResolveEnvPath('SMCENTRAL', 'sourcemod-central')
|
||||
self.sm_root = ResolveEnvPath('SOURCEMOD_DEV', 'sourcemod-central')
|
||||
|
||||
if not self.sm_root or not os.path.isdir(self.sm_root):
|
||||
raise Exception('Could not find a source copy of Sourcemod')
|
||||
raise Exception('Could not find a source copy of SourceMod')
|
||||
self.sm_root = Normalize(self.sm_root)
|
||||
|
||||
def configure(self):
|
||||
builder.AddConfigureFile('pushbuild.txt')
|
||||
|
||||
cxx = builder.DetectCompilers()
|
||||
|
||||
if cxx.like('gcc'):
|
||||
cxx.defines += [
|
||||
'stricmp=strcasecmp',
|
||||
'_stricmp=strcasecmp',
|
||||
'_snprintf=snprintf',
|
||||
'_vsnprintf=vsnprintf',
|
||||
'HAVE_STDINT_H',
|
||||
'GNUC',
|
||||
]
|
||||
cxx.cflags += [
|
||||
'-pipe',
|
||||
'-fno-strict-aliasing',
|
||||
'-Wall',
|
||||
'-Werror',
|
||||
'-Wno-unused',
|
||||
'-Wno-switch',
|
||||
'-msse',
|
||||
'-m32',
|
||||
]
|
||||
cxx.cxxflags += [
|
||||
'-std=c++11',
|
||||
]
|
||||
|
||||
have_gcc = cxx.vendor == 'gcc'
|
||||
have_clang = cxx.vendor == 'clang'
|
||||
if have_clang or (have_gcc and cxx.version >= '4'):
|
||||
cxx.cflags += ['-fvisibility=hidden']
|
||||
cxx.cxxflags += ['-fvisibility-inlines-hidden']
|
||||
if have_clang or (have_gcc and cxx.version >= '4.6'):
|
||||
cxx.cflags += ['-Wno-narrowing']
|
||||
if (have_gcc and cxx.version >= '4.7') or (have_clang and cxx.version >= '3'):
|
||||
cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
|
||||
if have_gcc and cxx.version >= '4.8':
|
||||
cxx.cflags += ['-Wno-unused-result']
|
||||
if have_clang:
|
||||
cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
|
||||
if (builder.target_platform == 'mac' and cxx.version >= '5.1') or cxx.version >= '3.4':
|
||||
cxx.cxxflags += ['-Wno-deprecated-register']
|
||||
else:
|
||||
cxx.cxxflags += ['-Wno-deprecated']
|
||||
cxx.cflags += ['-Wno-sometimes-uninitialized']
|
||||
|
||||
cxx.linkflags += ['-m32']
|
||||
cxx.cxxflags += [
|
||||
'-fno-exceptions',
|
||||
'-fno-threadsafe-statics',
|
||||
'-Wno-non-virtual-dtor',
|
||||
'-Wno-overloaded-virtual',
|
||||
]
|
||||
|
||||
if have_gcc:
|
||||
cxx.cflags += ['-mfpmath=sse']
|
||||
self.configure_gcc(cxx)
|
||||
elif cxx.vendor == 'msvc':
|
||||
if builder.options.debug == '1':
|
||||
cxx.cflags += ['/MTd']
|
||||
cxx.linkflags += ['/NODEFAULTLIB:libcmt']
|
||||
else:
|
||||
cxx.cflags += ['/MT']
|
||||
cxx.defines += [
|
||||
'_CRT_SECURE_NO_DEPRECATE',
|
||||
'_CRT_SECURE_NO_WARNINGS',
|
||||
'_CRT_NONSTDC_NO_DEPRECATE',
|
||||
'_ITERATOR_DEBUG_LEVEL=0',
|
||||
]
|
||||
cxx.cflags += [
|
||||
'/W3',
|
||||
]
|
||||
cxx.cxxflags += [
|
||||
'/EHsc',
|
||||
'/GR-',
|
||||
'/TP',
|
||||
]
|
||||
cxx.linkflags += [
|
||||
'/MACHINE:X86',
|
||||
'/SUBSYSTEM:WINDOWS',
|
||||
'kernel32.lib',
|
||||
'user32.lib',
|
||||
'gdi32.lib',
|
||||
'winspool.lib',
|
||||
'comdlg32.lib',
|
||||
'advapi32.lib',
|
||||
'shell32.lib',
|
||||
'ole32.lib',
|
||||
'oleaut32.lib',
|
||||
'uuid.lib',
|
||||
'odbc32.lib',
|
||||
'odbccp32.lib',
|
||||
]
|
||||
self.configure_msvc(cxx)
|
||||
|
||||
# Optimization
|
||||
# Optimizaiton
|
||||
if builder.options.opt == '1':
|
||||
cxx.defines += ['NDEBUG']
|
||||
if cxx.like('gcc'):
|
||||
cxx.cflags += ['-O3']
|
||||
elif cxx.like('msvc'):
|
||||
cxx.cflags += ['/Ox']
|
||||
cxx.linkflags += ['/OPT:ICF', '/OPT:REF']
|
||||
|
||||
# Debugging
|
||||
if builder.options.debug == '1':
|
||||
cxx.defines += ['DEBUG', '_DEBUG']
|
||||
if cxx.like('msvc'):
|
||||
cxx.cflags += ['/Od', '/RTC1']
|
||||
if cxx.version >= 1600:
|
||||
cxx.cflags += ['/d2Zi+']
|
||||
|
||||
# This needs to be after our optimization flags which could otherwise disable it.
|
||||
if cxx.vendor == 'msvc':
|
||||
# Don't omit the frame pointer.
|
||||
cxx.cflags += ['/Oy-']
|
||||
|
||||
# Platform-specifics
|
||||
if builder.target_platform == 'linux':
|
||||
cxx.defines += ['_LINUX', 'POSIX']
|
||||
if cxx.vendor == 'gcc':
|
||||
cxx.linkflags += ['-static-libgcc']
|
||||
elif cxx.vendor == 'clang':
|
||||
cxx.linkflags += ['-lgcc_eh']
|
||||
self.configure_linux(cxx)
|
||||
elif builder.target_platform == 'mac':
|
||||
cxx.defines += ['OSX', '_OSX', 'POSIX']
|
||||
cxx.cflags += ['-mmacosx-version-min=10.5']
|
||||
cxx.linkflags += [
|
||||
'-mmacosx-version-min=10.5',
|
||||
'-arch', 'i386',
|
||||
'-lstdc++',
|
||||
'-stdlib=libstdc++',
|
||||
]
|
||||
cxx.cxxflags += ['-stdlib=libstdc++']
|
||||
self.configure_mac(cxx)
|
||||
elif builder.target_platform == 'windows':
|
||||
cxx.defines += ['WIN32', '_WINDOWS']
|
||||
|
||||
self.configure_windows(cxx)
|
||||
|
||||
# Finish up.
|
||||
cxx.includes += [
|
||||
os.path.join(self.sm_root, 'public'),
|
||||
]
|
||||
|
||||
def configure_gcc(self, cxx):
|
||||
cxx.defines += [
|
||||
'stricmp=strcasecmp',
|
||||
'_stricmp=strcasecmp',
|
||||
'_snprintf=snprintf',
|
||||
'_vsnprintf=vsnprintf',
|
||||
'HAVE_STDINT_H',
|
||||
'GNUC',
|
||||
]
|
||||
cxx.cflags += [
|
||||
'-pipe',
|
||||
'-fno-strict-aliasing',
|
||||
# '-Wall',
|
||||
'-Werror',
|
||||
'-Wno-unused',
|
||||
'-Wno-switch',
|
||||
'-Wno-array-bounds',
|
||||
'-msse',
|
||||
'-m32',
|
||||
'-fvisibility=hidden',
|
||||
]
|
||||
cxx.cxxflags += [
|
||||
'-std=c++11',
|
||||
'-fno-exceptions',
|
||||
'-fno-threadsafe-statics',
|
||||
'-Wno-non-virtual-dtor',
|
||||
'-Wno-overloaded-virtual',
|
||||
'-fvisibility-inlines-hidden',
|
||||
]
|
||||
cxx.linkflags += ['-m32']
|
||||
|
||||
have_gcc = cxx.vendor == 'gcc'
|
||||
have_clang = cxx.vendor == 'clang'
|
||||
if cxx.version >= 'clang-3.6':
|
||||
cxx.cxxflags += ['-Wno-inconsistent-missing-override']
|
||||
if have_clang or (cxx.version >= 'gcc-4.6'):
|
||||
cxx.cflags += ['-Wno-narrowing']
|
||||
if have_clang or (cxx.version >= 'gcc-4.7'):
|
||||
cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
|
||||
if cxx.version >= 'gcc-4.8':
|
||||
cxx.cflags += ['-Wno-unused-result']
|
||||
|
||||
if have_clang:
|
||||
cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
|
||||
if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4':
|
||||
cxx.cxxflags += ['-Wno-deprecated-register']
|
||||
else:
|
||||
cxx.cxxflags += ['-Wno-deprecated']
|
||||
cxx.cflags += ['-Wno-sometimes-uninitialized']
|
||||
|
||||
if have_gcc:
|
||||
cxx.cflags += ['-mfpmath=sse']
|
||||
|
||||
if builder.options.opt == '1':
|
||||
cxx.cflags += ['-O3']
|
||||
|
||||
def configure_msvc(self, cxx):
|
||||
if builder.options.debug == '1':
|
||||
cxx.cflags += ['/MTd']
|
||||
cxx.linkflags += ['/NODEFAULTLIB:libcmt']
|
||||
else:
|
||||
cxx.cflags += ['/MT']
|
||||
cxx.defines += [
|
||||
'_CRT_SECURE_NO_DEPRECATE',
|
||||
'_CRT_SECURE_NO_WARNINGS',
|
||||
'_CRT_NONSTDC_NO_DEPRECATE',
|
||||
'_ITERATOR_DEBUG_LEVEL=0',
|
||||
]
|
||||
cxx.cflags += [
|
||||
'/W3',
|
||||
]
|
||||
cxx.cxxflags += [
|
||||
'/EHsc',
|
||||
'/GR-',
|
||||
'/TP',
|
||||
]
|
||||
cxx.linkflags += [
|
||||
'/MACHINE:X86',
|
||||
'kernel32.lib',
|
||||
'user32.lib',
|
||||
'gdi32.lib',
|
||||
'winspool.lib',
|
||||
'comdlg32.lib',
|
||||
'advapi32.lib',
|
||||
'shell32.lib',
|
||||
'ole32.lib',
|
||||
'oleaut32.lib',
|
||||
'uuid.lib',
|
||||
'odbc32.lib',
|
||||
'odbccp32.lib',
|
||||
]
|
||||
|
||||
if builder.options.opt == '1':
|
||||
cxx.cflags += ['/Ox', '/Zo']
|
||||
cxx.linkflags += ['/OPT:ICF', '/OPT:REF']
|
||||
|
||||
if builder.options.debug == '1':
|
||||
cxx.cflags += ['/Od', '/RTC1']
|
||||
|
||||
# This needs to be after our optimization flags which could otherwise disable it.
|
||||
# Don't omit the frame pointer.
|
||||
cxx.cflags += ['/Oy-']
|
||||
|
||||
def configure_linux(self, cxx):
|
||||
cxx.defines += ['_LINUX', 'POSIX']
|
||||
cxx.linkflags += ['-Wl,--exclude-libs,ALL', '-lm']
|
||||
if cxx.vendor == 'gcc':
|
||||
cxx.linkflags += ['-static-libgcc']
|
||||
elif cxx.vendor == 'clang':
|
||||
cxx.linkflags += ['-lgcc_eh']
|
||||
|
||||
def configure_mac(self, cxx):
|
||||
cxx.defines += ['OSX', '_OSX', 'POSIX']
|
||||
cxx.cflags += ['-mmacosx-version-min=10.5']
|
||||
cxx.linkflags += [
|
||||
'-mmacosx-version-min=10.5',
|
||||
'-arch', 'i386',
|
||||
'-lstdc++',
|
||||
'-stdlib=libstdc++',
|
||||
]
|
||||
cxx.cxxflags += ['-stdlib=libstdc++']
|
||||
|
||||
def configure_windows(self, cxx):
|
||||
cxx.defines += ['WIN32', '_WINDOWS']
|
||||
|
||||
def ConfigureForExtension(self, context, compiler):
|
||||
compiler.cxxincludes += [
|
||||
os.path.join(context.currentSourcePath),
|
||||
os.path.join(context.currentSourcePath, 'libs', 'libuv-v1.5.0', 'include'),
|
||||
os.path.join(context.currentSourcePath, 'sdk'),
|
||||
os.path.join(self.sm_root, 'public'),
|
||||
os.path.join(self.sm_root, 'public', 'amtl'),
|
||||
os.path.join(self.sm_root, 'public', 'extensions'),
|
||||
os.path.join(self.sm_root, 'public', 'sourcepawn')
|
||||
os.path.join(self.sm_root, 'sourcepawn', 'include'),
|
||||
os.path.join(self.sm_root, 'public', 'amtl', 'amtl'),
|
||||
os.path.join(self.sm_root, 'public', 'amtl'),
|
||||
]
|
||||
return compiler
|
||||
|
||||
@ -200,5 +220,14 @@ AsyncSocket = AsyncSocketConfig()
|
||||
AsyncSocket.detectSDKs()
|
||||
AsyncSocket.configure()
|
||||
|
||||
builder.RunBuildScripts(['extension/AMBuilder'], { 'AsyncSocket': AsyncSocket })
|
||||
builder.RunScript('PackageScript', { 'AsyncSocket': AsyncSocket })
|
||||
# Add additional buildscripts here
|
||||
BuildScripts = [
|
||||
'extension/AMBuilder'
|
||||
]
|
||||
|
||||
if builder.backend == 'amb2':
|
||||
BuildScripts += [
|
||||
'PackageScript',
|
||||
]
|
||||
|
||||
builder.RunBuildScripts(BuildScripts, { 'AsyncSocket': AsyncSocket})
|
||||
|
||||
10
README.md
Normal file
10
README.md
Normal file
@ -0,0 +1,10 @@
|
||||
# async_connect
|
||||
|
||||
You need to compile https://github.com/libuv/libuv for 32bit like below if you have a 64bit OS.
|
||||
```
|
||||
sh autgen.sh
|
||||
./configure --build=i686-pc-linux-gnu "CFLAGS=-m32" "CXXFLAGS=-m32" "LDFLAGS=-m32" --disable-shared --enable-static
|
||||
make
|
||||
```
|
||||
|
||||
Put the `libuv/include` folder and `libuv/.libs/libuv.a` in `extensions/libuv`.
|
||||
@ -5,7 +5,7 @@ binary = builder.compiler.Library('async_socket.ext')
|
||||
AsyncSocket.ConfigureForExtension(builder, binary.compiler)
|
||||
|
||||
binary.compiler.includes += [
|
||||
os.path.join(builder.sourcePath, 'extension', 'libs', 'libuv-v1.5.0', 'include')
|
||||
os.path.join(builder.sourcePath, 'extension', 'libuv', 'include')
|
||||
]
|
||||
|
||||
binary.sources += [
|
||||
@ -14,11 +14,17 @@ binary.sources += [
|
||||
os.path.join(AsyncSocket.sm_root, 'public', 'smsdk_ext.cpp')
|
||||
]
|
||||
|
||||
binary.compiler.defines += ['SOURCEMOD_BUILD']
|
||||
binary.compiler.defines += [
|
||||
'SOURCEMOD_BUILD'
|
||||
]
|
||||
|
||||
binary.compiler.postlink += [os.path.join(builder.sourcePath, 'extension', 'libs', 'libuv-v1.5.0', '.libs', 'libuv.a')]
|
||||
binary.compiler.postlink += [
|
||||
os.path.join(builder.sourcePath, 'extension', 'libuv', 'libuv.a')
|
||||
]
|
||||
|
||||
if builder.target_platform == 'windows':
|
||||
binary.compiler.linkflags += ['ws2_32.lib']
|
||||
|
||||
AsyncSocket.extensions += [builder.Add(binary)]
|
||||
AsyncSocket.extensions += [
|
||||
builder.Add(binary)
|
||||
]
|
||||
|
||||
664
extension/atomicops.h
Normal file
664
extension/atomicops.h
Normal file
@ -0,0 +1,664 @@
|
||||
// ©2013-2016 Cameron Desrochers.
|
||||
// Distributed under the simplified BSD license (see the license file that
|
||||
// should have come with this header).
|
||||
// Uses Jeff Preshing's semaphore implementation (under the terms of its
|
||||
// separate zlib license, embedded below).
|
||||
|
||||
#pragma once
|
||||
|
||||
// Provides portable (VC++2010+, Intel ICC 13, GCC 4.7+, and anything C++11 compliant) implementation
|
||||
// of low-level memory barriers, plus a few semi-portable utility macros (for inlining and alignment).
|
||||
// Also has a basic atomic type (limited to hardware-supported atomics with no memory ordering guarantees).
|
||||
// Uses the AE_* prefix for macros (historical reasons), and the "moodycamel" namespace for symbols.
|
||||
|
||||
#include <cassert>
|
||||
#include <type_traits>
|
||||
#include <cerrno>
|
||||
#include <cstdint>
|
||||
#include <ctime>
|
||||
|
||||
// Platform detection
|
||||
#if defined(__INTEL_COMPILER)
|
||||
#define AE_ICC
|
||||
#elif defined(_MSC_VER)
|
||||
#define AE_VCPP
|
||||
#elif defined(__GNUC__)
|
||||
#define AE_GCC
|
||||
#endif
|
||||
|
||||
#if defined(_M_IA64) || defined(__ia64__)
|
||||
#define AE_ARCH_IA64
|
||||
#elif defined(_WIN64) || defined(__amd64__) || defined(_M_X64) || defined(__x86_64__)
|
||||
#define AE_ARCH_X64
|
||||
#elif defined(_M_IX86) || defined(__i386__)
|
||||
#define AE_ARCH_X86
|
||||
#elif defined(_M_PPC) || defined(__powerpc__)
|
||||
#define AE_ARCH_PPC
|
||||
#else
|
||||
#define AE_ARCH_UNKNOWN
|
||||
#endif
|
||||
|
||||
|
||||
// AE_UNUSED
|
||||
#define AE_UNUSED(x) ((void)x)
|
||||
|
||||
|
||||
// AE_FORCEINLINE
|
||||
#if defined(AE_VCPP) || defined(AE_ICC)
|
||||
#define AE_FORCEINLINE __forceinline
|
||||
#elif defined(AE_GCC)
|
||||
//#define AE_FORCEINLINE __attribute__((always_inline))
|
||||
#define AE_FORCEINLINE inline
|
||||
#else
|
||||
#define AE_FORCEINLINE inline
|
||||
#endif
|
||||
|
||||
|
||||
// AE_ALIGN
|
||||
#if defined(AE_VCPP) || defined(AE_ICC)
|
||||
#define AE_ALIGN(x) __declspec(align(x))
|
||||
#elif defined(AE_GCC)
|
||||
#define AE_ALIGN(x) __attribute__((aligned(x)))
|
||||
#else
|
||||
// Assume GCC compliant syntax...
|
||||
#define AE_ALIGN(x) __attribute__((aligned(x)))
|
||||
#endif
|
||||
|
||||
|
||||
// Portable atomic fences implemented below:
|
||||
|
||||
namespace moodycamel {
|
||||
|
||||
enum memory_order {
|
||||
memory_order_relaxed,
|
||||
memory_order_acquire,
|
||||
memory_order_release,
|
||||
memory_order_acq_rel,
|
||||
memory_order_seq_cst,
|
||||
|
||||
// memory_order_sync: Forces a full sync:
|
||||
// #LoadLoad, #LoadStore, #StoreStore, and most significantly, #StoreLoad
|
||||
memory_order_sync = memory_order_seq_cst
|
||||
};
|
||||
|
||||
} // end namespace moodycamel
|
||||
|
||||
#if (defined(AE_VCPP) && (_MSC_VER < 1700 || defined(__cplusplus_cli))) || defined(AE_ICC)
|
||||
// VS2010 and ICC13 don't support std::atomic_*_fence, implement our own fences
|
||||
|
||||
#include <intrin.h>
|
||||
|
||||
#if defined(AE_ARCH_X64) || defined(AE_ARCH_X86)
|
||||
#define AeFullSync _mm_mfence
|
||||
#define AeLiteSync _mm_mfence
|
||||
#elif defined(AE_ARCH_IA64)
|
||||
#define AeFullSync __mf
|
||||
#define AeLiteSync __mf
|
||||
#elif defined(AE_ARCH_PPC)
|
||||
#include <ppcintrinsics.h>
|
||||
#define AeFullSync __sync
|
||||
#define AeLiteSync __lwsync
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef AE_VCPP
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 4365) // Disable erroneous 'conversion from long to unsigned int, signed/unsigned mismatch' error when using `assert`
|
||||
#ifdef __cplusplus_cli
|
||||
#pragma managed(push, off)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
namespace moodycamel {
|
||||
|
||||
AE_FORCEINLINE void compiler_fence(memory_order order)
|
||||
{
|
||||
switch (order) {
|
||||
case memory_order_relaxed: break;
|
||||
case memory_order_acquire: _ReadBarrier(); break;
|
||||
case memory_order_release: _WriteBarrier(); break;
|
||||
case memory_order_acq_rel: _ReadWriteBarrier(); break;
|
||||
case memory_order_seq_cst: _ReadWriteBarrier(); break;
|
||||
default: assert(false);
|
||||
}
|
||||
}
|
||||
|
||||
// x86/x64 have a strong memory model -- all loads and stores have
|
||||
// acquire and release semantics automatically (so only need compiler
|
||||
// barriers for those).
|
||||
#if defined(AE_ARCH_X86) || defined(AE_ARCH_X64)
|
||||
AE_FORCEINLINE void fence(memory_order order)
|
||||
{
|
||||
switch (order) {
|
||||
case memory_order_relaxed: break;
|
||||
case memory_order_acquire: _ReadBarrier(); break;
|
||||
case memory_order_release: _WriteBarrier(); break;
|
||||
case memory_order_acq_rel: _ReadWriteBarrier(); break;
|
||||
case memory_order_seq_cst:
|
||||
_ReadWriteBarrier();
|
||||
AeFullSync();
|
||||
_ReadWriteBarrier();
|
||||
break;
|
||||
default: assert(false);
|
||||
}
|
||||
}
|
||||
#else
|
||||
AE_FORCEINLINE void fence(memory_order order)
|
||||
{
|
||||
// Non-specialized arch, use heavier memory barriers everywhere just in case :-(
|
||||
switch (order) {
|
||||
case memory_order_relaxed:
|
||||
break;
|
||||
case memory_order_acquire:
|
||||
_ReadBarrier();
|
||||
AeLiteSync();
|
||||
_ReadBarrier();
|
||||
break;
|
||||
case memory_order_release:
|
||||
_WriteBarrier();
|
||||
AeLiteSync();
|
||||
_WriteBarrier();
|
||||
break;
|
||||
case memory_order_acq_rel:
|
||||
_ReadWriteBarrier();
|
||||
AeLiteSync();
|
||||
_ReadWriteBarrier();
|
||||
break;
|
||||
case memory_order_seq_cst:
|
||||
_ReadWriteBarrier();
|
||||
AeFullSync();
|
||||
_ReadWriteBarrier();
|
||||
break;
|
||||
default: assert(false);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
} // end namespace moodycamel
|
||||
#else
|
||||
// Use standard library of atomics
|
||||
#include <atomic>
|
||||
|
||||
namespace moodycamel {
|
||||
|
||||
AE_FORCEINLINE void compiler_fence(memory_order order)
|
||||
{
|
||||
switch (order) {
|
||||
case memory_order_relaxed: break;
|
||||
case memory_order_acquire: std::atomic_signal_fence(std::memory_order_acquire); break;
|
||||
case memory_order_release: std::atomic_signal_fence(std::memory_order_release); break;
|
||||
case memory_order_acq_rel: std::atomic_signal_fence(std::memory_order_acq_rel); break;
|
||||
case memory_order_seq_cst: std::atomic_signal_fence(std::memory_order_seq_cst); break;
|
||||
default: assert(false);
|
||||
}
|
||||
}
|
||||
|
||||
AE_FORCEINLINE void fence(memory_order order)
|
||||
{
|
||||
switch (order) {
|
||||
case memory_order_relaxed: break;
|
||||
case memory_order_acquire: std::atomic_thread_fence(std::memory_order_acquire); break;
|
||||
case memory_order_release: std::atomic_thread_fence(std::memory_order_release); break;
|
||||
case memory_order_acq_rel: std::atomic_thread_fence(std::memory_order_acq_rel); break;
|
||||
case memory_order_seq_cst: std::atomic_thread_fence(std::memory_order_seq_cst); break;
|
||||
default: assert(false);
|
||||
}
|
||||
}
|
||||
|
||||
} // end namespace moodycamel
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#if !defined(AE_VCPP) || (_MSC_VER >= 1700 && !defined(__cplusplus_cli))
|
||||
#define AE_USE_STD_ATOMIC_FOR_WEAK_ATOMIC
|
||||
#endif
|
||||
|
||||
#ifdef AE_USE_STD_ATOMIC_FOR_WEAK_ATOMIC
|
||||
#include <atomic>
|
||||
#endif
|
||||
#include <utility>
|
||||
|
||||
// WARNING: *NOT* A REPLACEMENT FOR std::atomic. READ CAREFULLY:
|
||||
// Provides basic support for atomic variables -- no memory ordering guarantees are provided.
|
||||
// The guarantee of atomicity is only made for types that already have atomic load and store guarantees
|
||||
// at the hardware level -- on most platforms this generally means aligned pointers and integers (only).
|
||||
namespace moodycamel {
|
||||
template<typename T>
|
||||
class weak_atomic
|
||||
{
|
||||
public:
|
||||
weak_atomic() { }
|
||||
#ifdef AE_VCPP
|
||||
#pragma warning(disable: 4100) // Get rid of (erroneous) 'unreferenced formal parameter' warning
|
||||
#endif
|
||||
template<typename U> weak_atomic(U&& x) : value(std::forward<U>(x)) { }
|
||||
#ifdef __cplusplus_cli
|
||||
// Work around bug with universal reference/nullptr combination that only appears when /clr is on
|
||||
weak_atomic(nullptr_t) : value(nullptr) { }
|
||||
#endif
|
||||
weak_atomic(weak_atomic const& other) : value(other.value) { }
|
||||
weak_atomic(weak_atomic&& other) : value(std::move(other.value)) { }
|
||||
#ifdef AE_VCPP
|
||||
#pragma warning(default: 4100)
|
||||
#endif
|
||||
|
||||
AE_FORCEINLINE operator T() const { return load(); }
|
||||
|
||||
|
||||
#ifndef AE_USE_STD_ATOMIC_FOR_WEAK_ATOMIC
|
||||
template<typename U> AE_FORCEINLINE weak_atomic const& operator=(U&& x) { value = std::forward<U>(x); return *this; }
|
||||
AE_FORCEINLINE weak_atomic const& operator=(weak_atomic const& other) { value = other.value; return *this; }
|
||||
|
||||
AE_FORCEINLINE T load() const { return value; }
|
||||
|
||||
AE_FORCEINLINE T fetch_add_acquire(T increment)
|
||||
{
|
||||
#if defined(AE_ARCH_X64) || defined(AE_ARCH_X86)
|
||||
if (sizeof(T) == 4) return _InterlockedExchangeAdd((long volatile*)&value, (long)increment);
|
||||
#if defined(_M_AMD64)
|
||||
else if (sizeof(T) == 8) return _InterlockedExchangeAdd64((long long volatile*)&value, (long long)increment);
|
||||
#endif
|
||||
#else
|
||||
#error Unsupported platform
|
||||
#endif
|
||||
assert(false && "T must be either a 32 or 64 bit type");
|
||||
return value;
|
||||
}
|
||||
|
||||
AE_FORCEINLINE T fetch_add_release(T increment)
|
||||
{
|
||||
#if defined(AE_ARCH_X64) || defined(AE_ARCH_X86)
|
||||
if (sizeof(T) == 4) return _InterlockedExchangeAdd((long volatile*)&value, (long)increment);
|
||||
#if defined(_M_AMD64)
|
||||
else if (sizeof(T) == 8) return _InterlockedExchangeAdd64((long long volatile*)&value, (long long)increment);
|
||||
#endif
|
||||
#else
|
||||
#error Unsupported platform
|
||||
#endif
|
||||
assert(false && "T must be either a 32 or 64 bit type");
|
||||
return value;
|
||||
}
|
||||
#else
|
||||
template<typename U>
|
||||
AE_FORCEINLINE weak_atomic const& operator=(U&& x)
|
||||
{
|
||||
value.store(std::forward<U>(x), std::memory_order_relaxed);
|
||||
return *this;
|
||||
}
|
||||
|
||||
AE_FORCEINLINE weak_atomic const& operator=(weak_atomic const& other)
|
||||
{
|
||||
value.store(other.value.load(std::memory_order_relaxed), std::memory_order_relaxed);
|
||||
return *this;
|
||||
}
|
||||
|
||||
AE_FORCEINLINE T load() const { return value.load(std::memory_order_relaxed); }
|
||||
|
||||
AE_FORCEINLINE T fetch_add_acquire(T increment)
|
||||
{
|
||||
return value.fetch_add(increment, std::memory_order_acquire);
|
||||
}
|
||||
|
||||
AE_FORCEINLINE T fetch_add_release(T increment)
|
||||
{
|
||||
return value.fetch_add(increment, std::memory_order_release);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
private:
|
||||
#ifndef AE_USE_STD_ATOMIC_FOR_WEAK_ATOMIC
|
||||
// No std::atomic support, but still need to circumvent compiler optimizations.
|
||||
// `volatile` will make memory access slow, but is guaranteed to be reliable.
|
||||
volatile T value;
|
||||
#else
|
||||
std::atomic<T> value;
|
||||
#endif
|
||||
};
|
||||
|
||||
} // end namespace moodycamel
|
||||
|
||||
|
||||
|
||||
// Portable single-producer, single-consumer semaphore below:
|
||||
|
||||
#if defined(_WIN32)
|
||||
// Avoid including windows.h in a header; we only need a handful of
|
||||
// items, so we'll redeclare them here (this is relatively safe since
|
||||
// the API generally has to remain stable between Windows versions).
|
||||
// I know this is an ugly hack but it still beats polluting the global
|
||||
// namespace with thousands of generic names or adding a .cpp for nothing.
|
||||
extern "C" {
|
||||
struct _SECURITY_ATTRIBUTES;
|
||||
__declspec(dllimport) void* __stdcall CreateSemaphoreW(_SECURITY_ATTRIBUTES* lpSemaphoreAttributes, long lInitialCount, long lMaximumCount, const wchar_t* lpName);
|
||||
__declspec(dllimport) int __stdcall CloseHandle(void* hObject);
|
||||
__declspec(dllimport) unsigned long __stdcall WaitForSingleObject(void* hHandle, unsigned long dwMilliseconds);
|
||||
__declspec(dllimport) int __stdcall ReleaseSemaphore(void* hSemaphore, long lReleaseCount, long* lpPreviousCount);
|
||||
}
|
||||
#elif defined(__MACH__)
|
||||
#include <mach/mach.h>
|
||||
#elif defined(__unix__)
|
||||
#include <semaphore.h>
|
||||
#endif
|
||||
|
||||
namespace moodycamel
|
||||
{
|
||||
// Code in the spsc_sema namespace below is an adaptation of Jeff Preshing's
|
||||
// portable + lightweight semaphore implementations, originally from
|
||||
// https://github.com/preshing/cpp11-on-multicore/blob/master/common/sema.h
|
||||
// LICENSE:
|
||||
// Copyright (c) 2015 Jeff Preshing
|
||||
//
|
||||
// This software is provided 'as-is', without any express or implied
|
||||
// warranty. In no event will the authors be held liable for any damages
|
||||
// arising from the use of this software.
|
||||
//
|
||||
// Permission is granted to anyone to use this software for any purpose,
|
||||
// including commercial applications, and to alter it and redistribute it
|
||||
// freely, subject to the following restrictions:
|
||||
//
|
||||
// 1. The origin of this software must not be misrepresented; you must not
|
||||
// claim that you wrote the original software. If you use this software
|
||||
// in a product, an acknowledgement in the product documentation would be
|
||||
// appreciated but is not required.
|
||||
// 2. Altered source versions must be plainly marked as such, and must not be
|
||||
// misrepresented as being the original software.
|
||||
// 3. This notice may not be removed or altered from any source distribution.
|
||||
namespace spsc_sema
|
||||
{
|
||||
#if defined(_WIN32)
|
||||
class Semaphore
|
||||
{
|
||||
private:
|
||||
void* m_hSema;
|
||||
|
||||
Semaphore(const Semaphore& other);
|
||||
Semaphore& operator=(const Semaphore& other);
|
||||
|
||||
public:
|
||||
Semaphore(int initialCount = 0)
|
||||
{
|
||||
assert(initialCount >= 0);
|
||||
const long maxLong = 0x7fffffff;
|
||||
m_hSema = CreateSemaphoreW(nullptr, initialCount, maxLong, nullptr);
|
||||
}
|
||||
|
||||
~Semaphore()
|
||||
{
|
||||
CloseHandle(m_hSema);
|
||||
}
|
||||
|
||||
void wait()
|
||||
{
|
||||
const unsigned long infinite = 0xffffffff;
|
||||
WaitForSingleObject(m_hSema, infinite);
|
||||
}
|
||||
|
||||
bool try_wait()
|
||||
{
|
||||
const unsigned long RC_WAIT_TIMEOUT = 0x00000102;
|
||||
return WaitForSingleObject(m_hSema, 0) != RC_WAIT_TIMEOUT;
|
||||
}
|
||||
|
||||
bool timed_wait(std::uint64_t usecs)
|
||||
{
|
||||
const unsigned long RC_WAIT_TIMEOUT = 0x00000102;
|
||||
return WaitForSingleObject(m_hSema, (unsigned long)(usecs / 1000)) != RC_WAIT_TIMEOUT;
|
||||
}
|
||||
|
||||
void signal(int count = 1)
|
||||
{
|
||||
ReleaseSemaphore(m_hSema, count, nullptr);
|
||||
}
|
||||
};
|
||||
#elif defined(__MACH__)
|
||||
//---------------------------------------------------------
|
||||
// Semaphore (Apple iOS and OSX)
|
||||
// Can't use POSIX semaphores due to http://lists.apple.com/archives/darwin-kernel/2009/Apr/msg00010.html
|
||||
//---------------------------------------------------------
|
||||
class Semaphore
|
||||
{
|
||||
private:
|
||||
semaphore_t m_sema;
|
||||
|
||||
Semaphore(const Semaphore& other);
|
||||
Semaphore& operator=(const Semaphore& other);
|
||||
|
||||
public:
|
||||
Semaphore(int initialCount = 0)
|
||||
{
|
||||
assert(initialCount >= 0);
|
||||
semaphore_create(mach_task_self(), &m_sema, SYNC_POLICY_FIFO, initialCount);
|
||||
}
|
||||
|
||||
~Semaphore()
|
||||
{
|
||||
semaphore_destroy(mach_task_self(), m_sema);
|
||||
}
|
||||
|
||||
void wait()
|
||||
{
|
||||
semaphore_wait(m_sema);
|
||||
}
|
||||
|
||||
bool try_wait()
|
||||
{
|
||||
return timed_wait(0);
|
||||
}
|
||||
|
||||
bool timed_wait(std::int64_t timeout_usecs)
|
||||
{
|
||||
mach_timespec_t ts;
|
||||
ts.tv_sec = timeout_usecs / 1000000;
|
||||
ts.tv_nsec = (timeout_usecs % 1000000) * 1000;
|
||||
|
||||
// added in OSX 10.10: https://developer.apple.com/library/prerelease/mac/documentation/General/Reference/APIDiffsMacOSX10_10SeedDiff/modules/Darwin.html
|
||||
kern_return_t rc = semaphore_timedwait(m_sema, ts);
|
||||
|
||||
return rc != KERN_OPERATION_TIMED_OUT;
|
||||
}
|
||||
|
||||
void signal()
|
||||
{
|
||||
semaphore_signal(m_sema);
|
||||
}
|
||||
|
||||
void signal(int count)
|
||||
{
|
||||
while (count-- > 0)
|
||||
{
|
||||
semaphore_signal(m_sema);
|
||||
}
|
||||
}
|
||||
};
|
||||
#elif defined(__unix__)
|
||||
//---------------------------------------------------------
|
||||
// Semaphore (POSIX, Linux)
|
||||
//---------------------------------------------------------
|
||||
class Semaphore
|
||||
{
|
||||
private:
|
||||
sem_t m_sema;
|
||||
|
||||
Semaphore(const Semaphore& other);
|
||||
Semaphore& operator=(const Semaphore& other);
|
||||
|
||||
public:
|
||||
Semaphore(int initialCount = 0)
|
||||
{
|
||||
assert(initialCount >= 0);
|
||||
sem_init(&m_sema, 0, initialCount);
|
||||
}
|
||||
|
||||
~Semaphore()
|
||||
{
|
||||
sem_destroy(&m_sema);
|
||||
}
|
||||
|
||||
void wait()
|
||||
{
|
||||
// http://stackoverflow.com/questions/2013181/gdb-causes-sem-wait-to-fail-with-eintr-error
|
||||
int rc;
|
||||
do
|
||||
{
|
||||
rc = sem_wait(&m_sema);
|
||||
}
|
||||
while (rc == -1 && errno == EINTR);
|
||||
}
|
||||
|
||||
bool try_wait()
|
||||
{
|
||||
int rc;
|
||||
do {
|
||||
rc = sem_trywait(&m_sema);
|
||||
} while (rc == -1 && errno == EINTR);
|
||||
return !(rc == -1 && errno == EAGAIN);
|
||||
}
|
||||
|
||||
bool timed_wait(std::uint64_t usecs)
|
||||
{
|
||||
struct timespec ts;
|
||||
const int usecs_in_1_sec = 1000000;
|
||||
const int nsecs_in_1_sec = 1000000000;
|
||||
clock_gettime(CLOCK_REALTIME, &ts);
|
||||
ts.tv_sec += usecs / usecs_in_1_sec;
|
||||
ts.tv_nsec += (usecs % usecs_in_1_sec) * 1000;
|
||||
// sem_timedwait bombs if you have more than 1e9 in tv_nsec
|
||||
// so we have to clean things up before passing it in
|
||||
if (ts.tv_nsec > nsecs_in_1_sec) {
|
||||
ts.tv_nsec -= nsecs_in_1_sec;
|
||||
++ts.tv_sec;
|
||||
}
|
||||
|
||||
int rc;
|
||||
do {
|
||||
rc = sem_timedwait(&m_sema, &ts);
|
||||
} while (rc == -1 && errno == EINTR);
|
||||
return !(rc == -1 && errno == ETIMEDOUT);
|
||||
}
|
||||
|
||||
void signal()
|
||||
{
|
||||
sem_post(&m_sema);
|
||||
}
|
||||
|
||||
void signal(int count)
|
||||
{
|
||||
while (count-- > 0)
|
||||
{
|
||||
sem_post(&m_sema);
|
||||
}
|
||||
}
|
||||
};
|
||||
#else
|
||||
#error Unsupported platform! (No semaphore wrapper available)
|
||||
#endif
|
||||
|
||||
//---------------------------------------------------------
|
||||
// LightweightSemaphore
|
||||
//---------------------------------------------------------
|
||||
class LightweightSemaphore
|
||||
{
|
||||
public:
|
||||
typedef std::make_signed<std::size_t>::type ssize_t;
|
||||
|
||||
private:
|
||||
weak_atomic<ssize_t> m_count;
|
||||
Semaphore m_sema;
|
||||
|
||||
bool waitWithPartialSpinning(std::int64_t timeout_usecs = -1)
|
||||
{
|
||||
ssize_t oldCount;
|
||||
// Is there a better way to set the initial spin count?
|
||||
// If we lower it to 1000, testBenaphore becomes 15x slower on my Core i7-5930K Windows PC,
|
||||
// as threads start hitting the kernel semaphore.
|
||||
int spin = 10000;
|
||||
while (--spin >= 0)
|
||||
{
|
||||
if (m_count.load() > 0)
|
||||
{
|
||||
m_count.fetch_add_acquire(-1);
|
||||
return true;
|
||||
}
|
||||
compiler_fence(memory_order_acquire); // Prevent the compiler from collapsing the loop.
|
||||
}
|
||||
oldCount = m_count.fetch_add_acquire(-1);
|
||||
if (oldCount > 0)
|
||||
return true;
|
||||
if (timeout_usecs < 0)
|
||||
{
|
||||
m_sema.wait();
|
||||
return true;
|
||||
}
|
||||
if (m_sema.timed_wait(timeout_usecs))
|
||||
return true;
|
||||
// At this point, we've timed out waiting for the semaphore, but the
|
||||
// count is still decremented indicating we may still be waiting on
|
||||
// it. So we have to re-adjust the count, but only if the semaphore
|
||||
// wasn't signaled enough times for us too since then. If it was, we
|
||||
// need to release the semaphore too.
|
||||
while (true)
|
||||
{
|
||||
oldCount = m_count.fetch_add_release(1);
|
||||
if (oldCount < 0)
|
||||
return false; // successfully restored things to the way they were
|
||||
// Oh, the producer thread just signaled the semaphore after all. Try again:
|
||||
oldCount = m_count.fetch_add_acquire(-1);
|
||||
if (oldCount > 0 && m_sema.try_wait())
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
public:
|
||||
LightweightSemaphore(ssize_t initialCount = 0) : m_count(initialCount)
|
||||
{
|
||||
assert(initialCount >= 0);
|
||||
}
|
||||
|
||||
bool tryWait()
|
||||
{
|
||||
if (m_count.load() > 0)
|
||||
{
|
||||
m_count.fetch_add_acquire(-1);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void wait()
|
||||
{
|
||||
if (!tryWait())
|
||||
waitWithPartialSpinning();
|
||||
}
|
||||
|
||||
bool wait(std::int64_t timeout_usecs)
|
||||
{
|
||||
return tryWait() || waitWithPartialSpinning(timeout_usecs);
|
||||
}
|
||||
|
||||
void signal(ssize_t count = 1)
|
||||
{
|
||||
assert(count >= 0);
|
||||
ssize_t oldCount = m_count.fetch_add_release(count);
|
||||
assert(oldCount >= -1);
|
||||
if (oldCount < 0)
|
||||
{
|
||||
m_sema.signal(1);
|
||||
}
|
||||
}
|
||||
|
||||
ssize_t availableApprox() const
|
||||
{
|
||||
ssize_t count = m_count.load();
|
||||
return count > 0 ? count : 0;
|
||||
}
|
||||
};
|
||||
} // end namespace spsc_sema
|
||||
} // end namespace moodycamel
|
||||
|
||||
#if defined(AE_VCPP) && (_MSC_VER < 1700 || defined(__cplusplus_cli))
|
||||
#pragma warning(pop)
|
||||
#ifdef __cplusplus_cli
|
||||
#pragma managed(pop)
|
||||
#endif
|
||||
#endif
|
||||
@ -1,91 +1,86 @@
|
||||
#include "context.h"
|
||||
|
||||
AsyncSocketContext::AsyncSocketContext(IPluginContext* pContext) {
|
||||
this->pContext = pContext;
|
||||
CAsyncSocketContext::CAsyncSocketContext(IPluginContext *pContext)
|
||||
{
|
||||
this->m_pContext = pContext;
|
||||
|
||||
socket = NULL;
|
||||
stream = NULL;
|
||||
|
||||
connectCallback = NULL;
|
||||
errorCallback = NULL;
|
||||
dataCallback = NULL;
|
||||
m_pConnectCallback = NULL;
|
||||
m_pErrorCallback = NULL;
|
||||
m_pDataCallback = NULL;
|
||||
}
|
||||
|
||||
AsyncSocketContext::~AsyncSocketContext() {
|
||||
if (connect_req != NULL) {
|
||||
free(connect_req);
|
||||
}
|
||||
CAsyncSocketContext::~CAsyncSocketContext()
|
||||
{
|
||||
if(socket != NULL)
|
||||
uv_close((uv_handle_t *)socket, NULL);
|
||||
|
||||
if (socket != NULL) {
|
||||
uv_close((uv_handle_t *) socket, NULL);
|
||||
}
|
||||
if(m_pConnectCallback)
|
||||
forwards->ReleaseForward(m_pConnectCallback);
|
||||
|
||||
if (connectCallback) {
|
||||
forwards->ReleaseForward(connectCallback);
|
||||
}
|
||||
if(m_pErrorCallback)
|
||||
forwards->ReleaseForward(m_pErrorCallback);
|
||||
|
||||
if (errorCallback) {
|
||||
forwards->ReleaseForward(errorCallback);
|
||||
}
|
||||
|
||||
if (dataCallback) {
|
||||
forwards->ReleaseForward(dataCallback);
|
||||
}
|
||||
if(m_pDataCallback)
|
||||
forwards->ReleaseForward(m_pDataCallback);
|
||||
}
|
||||
|
||||
void AsyncSocketContext::Connected() {
|
||||
if (!connectCallback) {
|
||||
void CAsyncSocketContext::Connected()
|
||||
{
|
||||
if(!m_pConnectCallback)
|
||||
return;
|
||||
}
|
||||
|
||||
connectCallback->PushCell(hndl);
|
||||
connectCallback->Execute(NULL);
|
||||
m_pConnectCallback->PushCell(m_Handle);
|
||||
m_pConnectCallback->Execute(NULL);
|
||||
}
|
||||
|
||||
void AsyncSocketContext::OnError(int error) {
|
||||
if (!errorCallback) {
|
||||
void CAsyncSocketContext::OnError(int error)
|
||||
{
|
||||
if(!m_pErrorCallback)
|
||||
return;
|
||||
}
|
||||
|
||||
errorCallback->PushCell(hndl);
|
||||
errorCallback->PushCell(error);
|
||||
errorCallback->PushString(uv_err_name(error));
|
||||
errorCallback->Execute(NULL);
|
||||
m_pErrorCallback->PushCell(m_Handle);
|
||||
m_pErrorCallback->PushCell(error);
|
||||
m_pErrorCallback->PushString(uv_err_name(error));
|
||||
m_pErrorCallback->Execute(NULL);
|
||||
}
|
||||
|
||||
void AsyncSocketContext::OnData(char* data, ssize_t size) {
|
||||
if (!dataCallback) {
|
||||
void CAsyncSocketContext::OnData(char* data, ssize_t size)
|
||||
{
|
||||
if(!m_pDataCallback)
|
||||
return;
|
||||
}
|
||||
|
||||
dataCallback->PushCell(hndl);
|
||||
dataCallback->PushString(data);
|
||||
dataCallback->PushCell(size);
|
||||
dataCallback->Execute(NULL);
|
||||
m_pDataCallback->PushCell(m_Handle);
|
||||
m_pDataCallback->PushString(data);
|
||||
m_pDataCallback->PushCell(size);
|
||||
m_pDataCallback->Execute(NULL);
|
||||
}
|
||||
|
||||
bool AsyncSocketContext::SetConnectCallback(funcid_t function) {
|
||||
if (connectCallback) {
|
||||
forwards->ReleaseForward(connectCallback);
|
||||
}
|
||||
|
||||
connectCallback = forwards->CreateForwardEx(NULL, ET_Single, 1, NULL, Param_Cell);
|
||||
return connectCallback->AddFunction(pContext, function);
|
||||
bool CAsyncSocketContext::SetConnectCallback(funcid_t function)
|
||||
{
|
||||
if(m_pConnectCallback)
|
||||
forwards->ReleaseForward(m_pConnectCallback);
|
||||
|
||||
m_pConnectCallback = forwards->CreateForwardEx(NULL, ET_Single, 1, NULL, Param_Cell);
|
||||
return m_pConnectCallback->AddFunction(m_pContext, function);
|
||||
}
|
||||
|
||||
bool AsyncSocketContext::SetErrorCallback(funcid_t function) {
|
||||
if (connectCallback) {
|
||||
forwards->ReleaseForward(errorCallback);
|
||||
}
|
||||
bool CAsyncSocketContext::SetErrorCallback(funcid_t function)
|
||||
{
|
||||
if(m_pConnectCallback)
|
||||
forwards->ReleaseForward(m_pErrorCallback);
|
||||
|
||||
errorCallback = forwards->CreateForwardEx(NULL, ET_Single, 3, NULL, Param_Cell, Param_Cell, Param_String);
|
||||
return errorCallback->AddFunction(pContext, function);
|
||||
m_pErrorCallback = forwards->CreateForwardEx(NULL, ET_Single, 3, NULL, Param_Cell, Param_Cell, Param_String);
|
||||
return m_pErrorCallback->AddFunction(m_pContext, function);
|
||||
}
|
||||
|
||||
bool AsyncSocketContext::SetDataCallback(funcid_t function) {
|
||||
if (dataCallback) {
|
||||
forwards->ReleaseForward(dataCallback);
|
||||
}
|
||||
|
||||
dataCallback = forwards->CreateForwardEx(NULL, ET_Single, 3, NULL, Param_Cell, Param_String, Param_Cell);
|
||||
return dataCallback->AddFunction(pContext, function);
|
||||
}
|
||||
bool CAsyncSocketContext::SetDataCallback(funcid_t function)
|
||||
{
|
||||
if(m_pDataCallback)
|
||||
forwards->ReleaseForward(m_pDataCallback);
|
||||
|
||||
m_pDataCallback = forwards->CreateForwardEx(NULL, ET_Single, 3, NULL, Param_Cell, Param_String, Param_Cell);
|
||||
return m_pDataCallback->AddFunction(m_pContext, function);
|
||||
}
|
||||
|
||||
@ -6,36 +6,35 @@
|
||||
|
||||
#include "smsdk_ext.h"
|
||||
|
||||
class AsyncSocketContext {
|
||||
class CAsyncSocketContext
|
||||
{
|
||||
public:
|
||||
IPluginContext* pContext;
|
||||
IPluginContext *m_pContext;
|
||||
Handle_t m_Handle;
|
||||
|
||||
Handle_t hndl;
|
||||
char *m_pHost;
|
||||
int m_Port;
|
||||
|
||||
char* host;
|
||||
int port;
|
||||
|
||||
IChangeableForward *connectCallback;
|
||||
IChangeableForward *errorCallback;
|
||||
IChangeableForward *dataCallback;
|
||||
IChangeableForward *m_pConnectCallback;
|
||||
IChangeableForward *m_pErrorCallback;
|
||||
IChangeableForward *m_pDataCallback;
|
||||
|
||||
uv_getaddrinfo_t resolver;
|
||||
uv_connect_t* connect_req;
|
||||
uv_tcp_t* socket;
|
||||
uv_stream_t* stream;
|
||||
uv_tcp_t *socket;
|
||||
uv_stream_t *stream;
|
||||
|
||||
CAsyncSocketContext(IPluginContext *plugin);
|
||||
~CAsyncSocketContext();
|
||||
|
||||
AsyncSocketContext(IPluginContext* plugin);
|
||||
~AsyncSocketContext();
|
||||
|
||||
void Connected();
|
||||
|
||||
void OnError(int error);
|
||||
|
||||
void OnData(char* data, ssize_t size);
|
||||
void OnData(char *data, ssize_t size);
|
||||
|
||||
bool SetConnectCallback(funcid_t function);
|
||||
bool SetErrorCallback(funcid_t function);
|
||||
bool SetDataCallback(funcid_t function);
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
* This program is free software; you can redistribute it and/or modify it under
|
||||
* the terms of the GNU General Public License, version 3.0, as published by the
|
||||
* Free Software Foundation.
|
||||
*
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||
@ -30,8 +30,8 @@
|
||||
*/
|
||||
|
||||
#include "extension.h"
|
||||
#include "queue.h"
|
||||
#include "context.h"
|
||||
#include "readerwriterqueue.h"
|
||||
#include <uv.h>
|
||||
|
||||
/**
|
||||
@ -39,277 +39,190 @@
|
||||
* @brief Implement extension code here.
|
||||
*/
|
||||
|
||||
LockedQueue<AsyncSocketContext*> g_connect_queue;
|
||||
LockedQueue<socket_data_t*> g_data_queue;
|
||||
LockedQueue<error_data_t*> g_error_queue;
|
||||
moodycamel::ReaderWriterQueue<CAsyncSocketContext *> g_ConnectQueue;
|
||||
moodycamel::ReaderWriterQueue<CSocketError *> g_ErrorQueue;
|
||||
moodycamel::ReaderWriterQueue<CSocketData *> g_DataQueue;
|
||||
|
||||
uv_loop_t *loop;
|
||||
uv_loop_t *g_UV_Loop;
|
||||
uv_thread_t g_UV_LoopThread;
|
||||
|
||||
uv_thread_t loop_thread;
|
||||
|
||||
uv_async_t g_async_resolve;
|
||||
uv_async_t g_async_write;
|
||||
uv_async_t g_UV_AsyncAdded;
|
||||
moodycamel::ReaderWriterQueue<CAsyncAddJob> g_AsyncAddQueue;
|
||||
|
||||
AsyncSocket g_AsyncSocket; /**< Global singleton for extension's main interface */
|
||||
|
||||
SMEXT_LINK(&g_AsyncSocket);
|
||||
|
||||
void push_error(AsyncSocketContext *ctx, int error);
|
||||
|
||||
AsyncSocketContext* AsyncSocket::GetSocketInstanceByHandle(Handle_t handle) {
|
||||
CAsyncSocketContext *AsyncSocket::GetSocketInstanceByHandle(Handle_t handle)
|
||||
{
|
||||
HandleSecurity sec;
|
||||
sec.pOwner = NULL;
|
||||
sec.pIdentity = myself->GetIdentity();
|
||||
|
||||
AsyncSocketContext *client;
|
||||
|
||||
if (handlesys->ReadHandle(handle, socketHandleType, &sec, (void**)&client) != HandleError_None)
|
||||
CAsyncSocketContext *pContext;
|
||||
|
||||
if(handlesys->ReadHandle(handle, socketHandleType, &sec, (void **)&pContext) != HandleError_None)
|
||||
return NULL;
|
||||
|
||||
return client;
|
||||
return pContext;
|
||||
}
|
||||
|
||||
void AsyncSocket::OnHandleDestroy(HandleType_t type, void *object) {
|
||||
if(object != NULL) {
|
||||
AsyncSocketContext *ctx = (AsyncSocketContext *) object;
|
||||
|
||||
delete ctx;
|
||||
void AsyncSocket::OnHandleDestroy(HandleType_t type, void *object)
|
||||
{
|
||||
if(object != NULL)
|
||||
{
|
||||
CAsyncSocketContext *pContext = (CAsyncSocketContext *)object;
|
||||
delete pContext;
|
||||
}
|
||||
}
|
||||
|
||||
void OnGameFrame(bool simulating) {
|
||||
if (!g_connect_queue.Empty()) {
|
||||
g_connect_queue.Lock();
|
||||
while(!g_connect_queue.Empty()) {
|
||||
g_connect_queue.Pop()->Connected();
|
||||
}
|
||||
g_connect_queue.Unlock();
|
||||
void OnGameFrame(bool simulating)
|
||||
{
|
||||
CAsyncSocketContext *pContext;
|
||||
while(g_ConnectQueue.try_dequeue(pContext))
|
||||
{
|
||||
pContext->Connected();
|
||||
}
|
||||
|
||||
if (!g_error_queue.Empty()) {
|
||||
g_error_queue.Lock();
|
||||
while(!g_error_queue.Empty()) {
|
||||
error_data_t *err = g_error_queue.Pop();
|
||||
CSocketError *pError;
|
||||
while(g_ErrorQueue.try_dequeue(pError))
|
||||
{
|
||||
pError->pAsyncContext->OnError(pError->Error);
|
||||
|
||||
err->ctx->OnError(err->err);
|
||||
|
||||
free(err);
|
||||
}
|
||||
g_error_queue.Unlock();
|
||||
free(pError);
|
||||
}
|
||||
|
||||
if (!g_data_queue.Empty()) {
|
||||
g_data_queue.Lock();
|
||||
while(!g_data_queue.Empty()) {
|
||||
socket_data_t *data = g_data_queue.Pop();
|
||||
CSocketData *pData;
|
||||
while(g_DataQueue.try_dequeue(pData))
|
||||
{
|
||||
pData->pAsyncContext->OnData(pData->pBuffer, pData->BufferSize);
|
||||
|
||||
data->ctx->OnData(data->buf, data->size);
|
||||
free(pData->pBuffer);
|
||||
free(pData);
|
||||
}
|
||||
}
|
||||
|
||||
free(data->buf);
|
||||
free(data);
|
||||
}
|
||||
g_data_queue.Unlock();
|
||||
void UV_OnAsyncAdded(uv_async_t *pHandle)
|
||||
{
|
||||
CAsyncAddJob Job;
|
||||
while(g_AsyncAddQueue.try_dequeue(Job))
|
||||
{
|
||||
uv_async_t *pAsync = (uv_async_t *)malloc(sizeof(uv_async_t));
|
||||
uv_async_init(g_UV_Loop, pAsync, Job.CallbackFn);
|
||||
pAsync->data = Job.pData;
|
||||
uv_async_send(pAsync);
|
||||
}
|
||||
}
|
||||
|
||||
// main event loop thread
|
||||
void EventLoop(void* data) {
|
||||
uv_run(loop, UV_RUN_DEFAULT);
|
||||
void UV_EventLoop(void *data)
|
||||
{
|
||||
uv_run(g_UV_Loop, UV_RUN_DEFAULT);
|
||||
}
|
||||
|
||||
void alloc_buffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf) {
|
||||
buf->base = (char*) malloc(suggested_size);
|
||||
void UV_AllocBuffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf)
|
||||
{
|
||||
buf->base = (char *)malloc(suggested_size);
|
||||
buf->len = suggested_size;
|
||||
}
|
||||
|
||||
void on_read(uv_stream_t *client, ssize_t nread, const uv_buf_t *buf) {
|
||||
if (nread < 0) {
|
||||
push_error((AsyncSocketContext*) client->data, nread);
|
||||
// Should we decide to close the socket? For now let's let the plugin handle errors, including EOF.
|
||||
void UV_HandleCleanup(uv_handle_t *handle)
|
||||
{
|
||||
free(handle);
|
||||
}
|
||||
|
||||
void UV_PushError(CAsyncSocketContext *pContext, int error)
|
||||
{
|
||||
CSocketError *pError = (CSocketError *)malloc(sizeof(CSocketError));
|
||||
|
||||
pError->pAsyncContext = pContext;
|
||||
pError->Error = error;
|
||||
|
||||
g_ErrorQueue.enqueue(pError);
|
||||
}
|
||||
|
||||
void UV_OnRead(uv_stream_t *client, ssize_t nread, const uv_buf_t *buf)
|
||||
{
|
||||
CAsyncSocketContext *pContext = (CAsyncSocketContext *)client->data;
|
||||
if(nread < 0)
|
||||
{
|
||||
// Connection closed
|
||||
uv_close((uv_handle_t *)client, NULL);
|
||||
pContext->socket = NULL;
|
||||
|
||||
UV_PushError((CAsyncSocketContext *)client->data, nread);
|
||||
return;
|
||||
}
|
||||
|
||||
char *data = (char*) malloc(sizeof(char) * (nread+1));
|
||||
data[nread] = '\0';
|
||||
char *data = (char *)malloc(sizeof(char) * (nread + 1));
|
||||
data[nread] = 0;
|
||||
strncpy(data, buf->base, nread);
|
||||
|
||||
socket_data_t *s = (socket_data_t *) malloc(sizeof(socket_data_t));
|
||||
CSocketData *pData = (CSocketData *)malloc(sizeof(CSocketData));
|
||||
pData->pAsyncContext = pContext;
|
||||
pData->pBuffer = data;
|
||||
pData->BufferSize = nread;
|
||||
|
||||
s->ctx = static_cast<AsyncSocketContext*>(client->data);
|
||||
s->buf = data;
|
||||
s->size = nread;
|
||||
|
||||
g_data_queue.Lock();
|
||||
g_data_queue.Push(s);
|
||||
g_data_queue.Unlock();
|
||||
g_DataQueue.enqueue(pData);
|
||||
|
||||
free(buf->base);
|
||||
}
|
||||
|
||||
void on_connect(uv_connect_t *req, int status) {
|
||||
AsyncSocketContext *ctx = (AsyncSocketContext*) req->data;
|
||||
void UV_OnConnect(uv_connect_t *req, int status)
|
||||
{
|
||||
CAsyncSocketContext *pContext = (CAsyncSocketContext *)req->data;
|
||||
|
||||
if (status < 0) {
|
||||
push_error(ctx, status);
|
||||
if(status < 0)
|
||||
{
|
||||
UV_PushError(pContext, status);
|
||||
return;
|
||||
}
|
||||
|
||||
ctx->connect_req = NULL;
|
||||
ctx->stream = req->handle;
|
||||
pContext->stream = req->handle;
|
||||
|
||||
g_connect_queue.Lock();
|
||||
g_connect_queue.Push(ctx);
|
||||
g_connect_queue.Unlock();
|
||||
g_ConnectQueue.enqueue(pContext);
|
||||
|
||||
req->handle->data = req->data;
|
||||
free(req);
|
||||
|
||||
uv_read_start(ctx->stream, alloc_buffer, on_read);
|
||||
uv_read_start(pContext->stream, UV_AllocBuffer, UV_OnRead);
|
||||
}
|
||||
|
||||
void push_error(AsyncSocketContext *ctx, int error) {
|
||||
error_data_t *err = (error_data_t*) malloc(sizeof(error_data_t));
|
||||
void UV_OnAsyncResolved(uv_getaddrinfo_t *resolver, int status, struct addrinfo *res)
|
||||
{
|
||||
free(resolver->service);
|
||||
CAsyncSocketContext *pContext = (CAsyncSocketContext *) resolver->data;
|
||||
|
||||
err->ctx = ctx;
|
||||
err->err = error;
|
||||
|
||||
g_error_queue.Lock();
|
||||
g_error_queue.Push(err);
|
||||
g_error_queue.Unlock();
|
||||
}
|
||||
|
||||
void on_resolved(uv_getaddrinfo_t *resolver, int status, struct addrinfo *res) {
|
||||
AsyncSocketContext *ctx = (AsyncSocketContext *) resolver->data;
|
||||
|
||||
if (status < 0) {
|
||||
push_error(ctx, status);
|
||||
if(status < 0)
|
||||
{
|
||||
UV_PushError(pContext, status);
|
||||
return;
|
||||
}
|
||||
|
||||
uv_connect_t *connect_req = (uv_connect_t*) malloc(sizeof(uv_connect_t));
|
||||
uv_tcp_t *socket = (uv_tcp_t*) malloc(sizeof(uv_tcp_t));
|
||||
uv_connect_t *connect_req = (uv_connect_t *)malloc(sizeof(uv_connect_t));
|
||||
uv_tcp_t *socket = (uv_tcp_t *)malloc(sizeof(uv_tcp_t));
|
||||
|
||||
ctx->connect_req = connect_req;
|
||||
ctx->socket = socket;
|
||||
pContext->socket = socket;
|
||||
connect_req->data = pContext;
|
||||
|
||||
connect_req->data = ctx;
|
||||
char addr[32] = {0};
|
||||
uv_ip4_name((struct sockaddr_in *)res->ai_addr, addr, sizeof(addr));
|
||||
|
||||
char addr[17] = {'\0'};
|
||||
uv_ip4_name((struct sockaddr_in*) res->ai_addr, addr, 16);
|
||||
|
||||
uv_tcp_init(loop, socket);
|
||||
|
||||
uv_tcp_connect(connect_req, socket, (const struct sockaddr*) res->ai_addr, on_connect);
|
||||
uv_tcp_init(g_UV_Loop, socket);
|
||||
uv_tcp_connect(connect_req, socket, (const struct sockaddr*) res->ai_addr, UV_OnConnect);
|
||||
|
||||
uv_freeaddrinfo(res);
|
||||
}
|
||||
|
||||
cell_t Socket_Create(IPluginContext *pContext, const cell_t *params) {
|
||||
AsyncSocketContext *ctx = new AsyncSocketContext(pContext);
|
||||
void UV_OnAsyncResolve(uv_async_t *handle)
|
||||
{
|
||||
CAsyncSocketContext *pAsyncContext = (CAsyncSocketContext *)handle->data;
|
||||
uv_close((uv_handle_t *)handle, UV_HandleCleanup);
|
||||
|
||||
ctx->hndl = handlesys->CreateHandle(g_AsyncSocket.socketHandleType, ctx, pContext->GetIdentity(), myself->GetIdentity(), NULL);
|
||||
pAsyncContext->resolver.data = pAsyncContext;
|
||||
|
||||
return ctx->hndl;
|
||||
}
|
||||
|
||||
cell_t Socket_Connect(IPluginContext *pContext, const cell_t *params) {
|
||||
AsyncSocketContext *ctx = g_AsyncSocket.GetSocketInstanceByHandle(params[1]);
|
||||
|
||||
if (ctx == NULL) {
|
||||
return pContext->ThrowNativeError("Invalid socket handle");
|
||||
}
|
||||
|
||||
if (params[3] < 0 || params[3] > 65535) {
|
||||
return pContext->ThrowNativeError("Invalid port specified");
|
||||
}
|
||||
|
||||
char *address = NULL;
|
||||
pContext->LocalToString(params[2], &address);
|
||||
|
||||
ctx->host = address;
|
||||
ctx->port = params[3];
|
||||
|
||||
g_async_resolve.data = ctx;
|
||||
uv_async_send(&g_async_resolve);
|
||||
|
||||
return 1;
|
||||