Permalink
Browse files

Core/Worldserver: Updated server daemon it is now more streamlined to…

… trinity/skyfire,

worldserver is now running off ACE_singleton as it should be.
Core/Logging: Added support for SQLDriver (SQL Query logging).
Core/Soap: Dropped old OCSoap and implemented newest soap build.

Repo: Codestyle cleanups. tabs2spaces, "if(" ->"if (" , "switch("->"switch ("

Conflicts:

	dep/acelite/ace/ACE.cpp
	dep/acelite/ace/Basic_Types.cpp
	dep/acelite/ace/CMakeLists.txt
	dep/acelite/ace/Configuration_Import_Export.cpp
	dep/acelite/ace/IOStream.cpp
	dep/acelite/ace/Log_Msg.cpp
	dep/acelite/ace/Message_Block.cpp
	dep/acelite/ace/Notification_Queue.cpp
	dep/acelite/ace/OS_NS_Thread.cpp
	dep/acelite/ace/OS_NS_fcntl.cpp
	dep/acelite/ace/OS_NS_netdb.cpp
	dep/acelite/ace/OS_NS_sys_utsname.cpp
	dep/acelite/ace/OS_NS_time.cpp
	dep/acelite/ace/SOCK_Connector.cpp
	dep/acelite/ace/SOCK_Dgram.cpp
	dep/acelite/ace/SOCK_IO.cpp
	dep/acelite/ace/Select_Reactor_Base.cpp
	dep/acelite/ace/Service_Repository.cpp
	dep/acelite/ace/Stack_Trace.cpp
	dep/acelite/ace/TTY_IO.cpp
	dep/g3dlite/CMakeLists.txt
	dep/g3dlite/source/Any.cpp
	dep/g3dlite/source/CollisionDetection.cpp
	dep/g3dlite/source/System.cpp
	dep/g3dlite/source/fileutils.cpp
	dep/g3dlite/source/prompt.cpp
	dep/gsoap/CMakeLists.txt
	dep/gsoap/soapC.cpp
	dep/gsoap/soapH.h
	dep/gsoap/soapServer.cpp
	dep/gsoap/soapStub.h
	dep/gsoap/stdsoap2.h
	dep/mysqllite/CMakeLists.txt
	dep/mysqllite/dbug/dbug.c
	dep/mysqllite/mysys/default.c
	dep/mysqllite/mysys/mf_keycache.c
	dep/mysqllite/mysys/mf_tempfile.c
	dep/mysqllite/mysys/my_fopen.c
	dep/mysqllite/mysys/my_gethwaddr.c
	dep/mysqllite/mysys/my_pread.c
	dep/mysqllite/mysys/my_quick.c
	dep/mysqllite/mysys/my_wincond.c
	dep/mysqllite/mysys/my_winfile.c
	dep/mysqllite/mysys/my_winthread.c
	dep/mysqllite/mysys/stacktrace.c
	dep/mysqllite/sql-common/client_plugin.c
	dep/mysqllite/strings/ctype.c
	dep/mysqllite/strings/xml.c
	dep/mysqllite/vio/viosocket.c
	src/server/worldserver/RemoteAccess/RARunnable.cpp
	src/server/worldserver/RemoteAccess/RARunnable.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/RemoteAccess/RASocket.h
  • Loading branch information...
1 parent 1675daa commit 61da2eefd8cc2209feb258290be1e273e23c836d @Bootz Bootz committed Mar 19, 2012
Showing 321 changed files with 1,916 additions and 1,761 deletions.
View
@@ -28,7 +28,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/macros")
# build in Release-mode by default if not explicitly set
-if( NOT CMAKE_BUILD_TYPE )
+if ( NOT CMAKE_BUILD_TYPE )
set(CMAKE_BUILD_TYPE "Release")
endif()
@@ -39,7 +39,7 @@ include(CheckIncludeFiles)
include(cmake/options.cmake)
# turn off PCH totally if enabled (hidden setting, mainly for devs)
-if( NOPCH )
+if ( NOPCH )
set(USE_COREPCH 0)
set(USE_SCRIPTPCH 0)
endif()
@@ -50,11 +50,11 @@ include(CheckPlatform)
find_package(PCHSupport)
find_package(ACE REQUIRED)
find_package(OpenSSL REQUIRED)
-if( NOT USE_MYSQL_SOURCES )
+if ( NOT USE_MYSQL_SOURCES )
find_package(MySQL REQUIRED)
endif()
-if( UNIX )
+if ( UNIX )
find_package(Readline)
find_package(ZLIB)
find_package(BZip2)
View
@@ -2172,7 +2172,7 @@ ACE::handle_ready (ACE_HANDLE handle,
fds.fd = handle;
fds.events = read_ready ? POLLIN : 0;
- if( write_ready )
+ if ( write_ready )
{
fds.events |= POLLOUT;
}
@@ -37,7 +37,7 @@ ACE_U_LongLong::as_string (ACE_TCHAR *output,
}
else
{
- switch(base)
+ switch (base)
{
case 8:
{
@@ -332,7 +332,7 @@ add_definitions(-DACE_BUILD_DLL)
add_library(ace SHARED ${ace_STAT_SRCS})
-if( WIN32 )
+if ( WIN32 )
if (MSYS OR MINGW)
find_library(WS2_32_LIBRARY ws2_32)
target_link_libraries(ace ${WS2_32_LIBRARY})
@@ -374,7 +374,7 @@ ACE_Registry_ImpExp::process_previous_line_format (ACE_TCHAR* buffer,
if (*end == '\"')
{
// string type
- if(config_.set_string_value (section, buffer, end + 1))
+ if (config_.set_string_value (section, buffer, end + 1))
return -4;
}
else if (*end == '#')
@@ -161,7 +161,7 @@ ACE_Streambuf::underflow (void)
if (out_waiting () && syncout () == EOF)
return EOF;
- if( ! pbase() )
+ if ( ! pbase() )
{
delete [] pbase_saved_;
(void) reset_put_buffer();
@@ -1935,7 +1935,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
(bp, bspace, format, wchar_t_str);
else
this_len = ACE_OS::sprintf (bp, format, wchar_t_str);
- if(sizeof(ACE_OS::WChar) != sizeof(wchar_t))
+ if (sizeof(ACE_OS::WChar) != sizeof(wchar_t))
{
delete [] wchar_t_str;
}
@@ -1178,7 +1178,7 @@ ACE_Message_Block::clone (Message_Flags mask) const
ACE_Message_Block *nb = 0;
- if(message_block_allocator_ == 0)
+ if (message_block_allocator_ == 0)
{
ACE_NEW_RETURN (nb,
ACE_Message_Block (0, // size
@@ -1208,7 +1208,7 @@ ACE_Message_Block::clone (Message_Flags mask) const
// ACE_NEW_MALLOC_RETURN, there would be a memory leak because the
// above db pointer would be left dangling.
nb = static_cast<ACE_Message_Block*> (message_block_allocator_->malloc (sizeof (ACE_Message_Block)));
- if(nb != 0)
+ if (nb != 0)
new (nb) ACE_Message_Block (0, // size
ACE_Message_Type (0), // type
0, // cont
@@ -213,7 +213,7 @@ ACE_Notification_Queue::pop_next_notification(
current = node->get();
free_queue_.push_front(node);
- if(!this->notify_queue_.is_empty())
+ if (!this->notify_queue_.is_empty())
{
more_messages_queued = true;
next = notify_queue_.head()->get();
@@ -662,7 +662,7 @@ TSS_Cleanup_Instance::TSS_Cleanup_Instance (Purpose purpose)
ptr_ = instance_;
++reference_count_;
}
- else if(purpose == DESTROY)
+ else if (purpose == DESTROY)
{
if (instance_ != 0)
{
@@ -792,7 +792,7 @@ ACE_TSS_Cleanup::thread_exit (void)
if (info.key_in_use () && this_thread_keys->is_set(info.key_))
{
// defer deleting the in-use key until all others have been deleted
- if(info.key_ != this->in_use_)
+ if (info.key_ != this->in_use_)
{
destructor[d_count] = 0;
tss_obj[d_count] = 0;
@@ -121,7 +121,7 @@ ACE_OS::open (const char *filename,
return h;
#elif defined (INTEGRITY)
ACE_UNUSED_ARG (sa);
- if(!strcmp(filename,ACE_DEV_NULL)) {
+ if (!strcmp(filename,ACE_DEV_NULL)) {
ACE_OSCALL_RETURN (::AllocateNullConsoleDescriptor(), ACE_HANDLE, -1);
}
else {
@@ -414,7 +414,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
if (ifr->ifr_addr.sa_family == AF_LINK)
{
- if(ACE_OS::strcmp (ifr->ifr_name, "en0") == 0)
+ if (ACE_OS::strcmp (ifr->ifr_name, "en0") == 0)
{
struct sockaddr_dl* sdl =
(struct sockaddr_dl *) &ifr->ifr_addr;
@@ -427,7 +427,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
ptr += sizeof(ifr->ifr_name);
- if(sizeof(ifr->ifr_addr) > ifr->ifr_addr.sa_len)
+ if (sizeof(ifr->ifr_addr) > ifr->ifr_addr.sa_len)
ptr += sizeof(ifr->ifr_addr);
else
ptr += ifr->ifr_addr.sa_len;
@@ -225,7 +225,7 @@ ACE_OS::uname (ACE_utsname *name)
return ACE_OS::hostname (name->nodename, maxnamelen);
#elif defined (INTEGRITY)
- if(!name) {
+ if (!name) {
errno = EFAULT;
return -1;
}
@@ -270,7 +270,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res)
res->tm_hour = systime.wHour;
- if(pTz.DaylightBias!=0)
+ if (pTz.DaylightBias!=0)
res->tm_isdst = 1;
else
res->tm_isdst = 1;
@@ -128,7 +128,7 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream,
// the select() with ETIME - in this case return
// EWOULDBLOCK so the wait strategy can complete the
// connection.
- if(ACE::handle_timed_complete (new_stream.get_handle (),
+ if (ACE::handle_timed_complete (new_stream.get_handle (),
timeout) == ACE_INVALID_HANDLE)
{
int const tmp = errno;
@@ -50,7 +50,7 @@ ACE_SOCK_Dgram::recv (iovec *io_vec,
{
ACE_TRACE ("ACE_SOCK_Dgram::recv");
#if defined (FIONREAD)
- if( ACE::handle_read_ready (this->get_handle (), timeout) != 1 )
+ if ( ACE::handle_read_ready (this->get_handle (), timeout) != 1 )
{
return -1;
}
@@ -424,7 +424,7 @@ ACE_SOCK_Dgram::recv (void *buf,
int flags,
const ACE_Time_Value *timeout) const
{
- if( ACE::handle_read_ready (this->get_handle (), timeout) == 1 )
+ if ( ACE::handle_read_ready (this->get_handle (), timeout) == 1 )
{
// Goes fine, call <recv> to get data
return this->recv (buf, n, addr, flags);
@@ -443,7 +443,7 @@ ACE_SOCK_Dgram::send (const void *buf,
const ACE_Time_Value *timeout) const
{
// Check the status of the current socket.
- if( ACE::handle_write_ready (this->get_handle (), timeout) == 1 )
+ if ( ACE::handle_write_ready (this->get_handle (), timeout) == 1 )
{
// Goes fine, call <send> to transmit the data.
return this->send (buf, n, addr, flags);
@@ -34,7 +34,7 @@ ACE_SOCK_IO::recvv (iovec *io_vec,
ACE_TRACE ("ACE_SOCK_IO::recvv");
#if defined (FIONREAD)
io_vec->iov_base = 0;
- if( ACE::handle_read_ready (this->get_handle (), timeout) != 1 )
+ if ( ACE::handle_read_ready (this->get_handle (), timeout) != 1 )
{
return -1;
}
@@ -802,7 +802,7 @@ ACE_Select_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer)
return result;
}
- if(more_messages_queued)
+ if (more_messages_queued)
{
(void) ACE::send(this->notification_pipe_.write_handle(),
(char *)&next, sizeof(ACE_Notification_Buffer));
@@ -212,7 +212,7 @@ ACE_Service_Repository::close (void)
ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
#ifndef ACE_NLOGGING
- if(ACE::debug ())
+ if (ACE::debug ())
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("ACE (%P|%t) SR::close - repo=%@, size=%d\n"),
this,
@@ -228,7 +228,7 @@ ACE_Service_Repository::close (void)
const_cast<ACE_Service_Type *> (this->service_array_[i]);
#ifndef ACE_NLOGGING
- if(ACE::debug ())
+ if (ACE::debug ())
{
if (s == 0)
ACE_DEBUG ((LM_DEBUG,
@@ -256,7 +256,7 @@ ACE_Service_Repository::~ACE_Service_Repository (void)
{
ACE_TRACE ("ACE_Service_Repository::~ACE_Service_Repository");
#ifndef ACE_NLOGGING
- if(ACE::debug ())
+ if (ACE::debug ())
ACE_DEBUG ((LM_DEBUG, "ACE (%P|%t) SR::<dtor>, this=%@\n", this));
#endif
this->close ();
@@ -239,7 +239,7 @@ ACE_Stack_Trace::generate_trace (ssize_t starting_frame_offset,
return;
}
- if(prevPc == 0 || prevFp == 0) break;
+ if (prevPc == 0 || prevFp == 0) break;
if (depth >= starting_frame)
{
@@ -399,7 +399,7 @@ add_frame_to_buf (void* pc, void* usrarg)
const char* func = "??";
const char* lib = "??";
- if(dladdr(pc, & info) != 0)
+ if (dladdr(pc, & info) != 0)
{
lib = (const char *) info.dli_fname;
func = (const char *) info.dli_sname;
@@ -295,7 +295,7 @@ int ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const
#if defined (IGNBRK)
// If device is not a modem set to ignore break points
- if(arg->modem)
+ if (arg->modem)
devpar.c_iflag &= ~IGNBRK;
else
devpar.c_iflag |= IGNBRK;
@@ -54,7 +54,7 @@ set(g3dlib_STAT_SRCS
source/Vector4.cpp
)
-if(WIN32)
+if (WIN32)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/dep/zlib
@@ -1234,7 +1234,7 @@ void Any::verifySize(int s) const {
}
std::string Any::toString(Type t) {
- switch(t) {
+ switch (t) {
case NONE: return "NONE";
case BOOLEAN: return "BOOLEAN";
case NUMBER: return "NUMBER";
@@ -2179,10 +2179,10 @@ bool CollisionDetection::fixedSolidSphereIntersectsFixedTriangle(
#define FINDMINMAX(x0, x1, x2, min, max) \
min = max = x0; \
- if(x1<min) min=x1;\
- if(x1>max) max=x1;\
- if(x2<min) min=x2;\
- if(x2>max) max=x2;
+ if (x1<min) min=x1;\
+ if (x1>max) max=x1;\
+ if (x2<min) min=x2;\
+ if (x2>max) max=x2;
static bool planeBoxOverlap(const Vector3& normal, const Vector3& vert, const Vector3& maxbox) {
Vector3 vmin, vmax;
@@ -2215,48 +2215,48 @@ static bool planeBoxOverlap(const Vector3& normal, const Vector3& vert, const Ve
#define AXISTEST_X01(a, b, fa, fb) \
p0 = a*v0[Y] - b*v0[Z]; \
p2 = a*v2[Y] - b*v2[Z]; \
- if(p0<p2) {min=p0; max=p2;} else {min=p2; max=p0;} \
+ if (p0<p2) {min=p0; max=p2;} else {min=p2; max=p0;} \
rad = fa * boxhalfsize[Y] + fb * boxhalfsize[Z]; \
- if(min>rad || max<-rad) return false;
+ if (min>rad || max<-rad) return false;
#define AXISTEST_X2(a, b, fa, fb) \
p0 = a*v0[Y] - b*v0[Z]; \
p1 = a*v1[Y] - b*v1[Z]; \
- if(p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
+ if (p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
rad = fa * boxhalfsize[Y] + fb * boxhalfsize[Z]; \
- if(min>rad || max<-rad) return false;
+ if (min>rad || max<-rad) return false;
/*======================== Y-tests ========================*/
#define AXISTEST_Y02(a, b, fa, fb) \
p0 = -a*v0[X] + b*v0[Z]; \
p2 = -a*v2[X] + b*v2[Z]; \
- if(p0<p2) {min=p0; max=p2;} else {min=p2; max=p0;} \
+ if (p0<p2) {min=p0; max=p2;} else {min=p2; max=p0;} \
rad = fa * boxhalfsize[X] + fb * boxhalfsize[Z]; \
- if(min>rad || max<-rad) return false;
+ if (min>rad || max<-rad) return false;
#define AXISTEST_Y1(a, b, fa, fb) \
p0 = -a*v0[X] + b*v0[Z]; \
p1 = -a*v1[X] + b*v1[Z]; \
- if(p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
+ if (p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
rad = fa * boxhalfsize[X] + fb * boxhalfsize[Z]; \
- if(min>rad || max<-rad) return false;
+ if (min>rad || max<-rad) return false;
/*======================== Z-tests ========================*/
#define AXISTEST_Z12(a, b, fa, fb) \
p1 = a*v1[X] - b*v1[Y]; \
p2 = a*v2[X] - b*v2[Y]; \
- if(p2<p1) {min=p2; max=p1;} else {min=p1; max=p2;} \
+ if (p2<p1) {min=p2; max=p1;} else {min=p1; max=p2;} \
rad = fa * boxhalfsize[X] + fb * boxhalfsize[Y]; \
- if(min>rad || max<-rad) return false;
+ if (min>rad || max<-rad) return false;
#define AXISTEST_Z0(a, b, fa, fb) \
p0 = a*v0[X] - b*v0[Y]; \
p1 = a*v1[X] - b*v1[Y]; \
- if(p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
+ if (p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
rad = fa * boxhalfsize[X] + fb * boxhalfsize[Y]; \
- if(min>rad || max<-rad) return false;
+ if (min>rad || max<-rad) return false;
bool CollisionDetection::fixedSolidBoxIntersectsFixedTriangle(
const AABox& box, const Triangle& tri) {
@@ -293,7 +293,7 @@ void System::init() {
switch (pInfo->cputype) {
case CPU_TYPE_POWERPC:
- switch(pInfo->cpusubtype){
+ switch (pInfo->cpusubtype){
case CPU_SUBTYPE_POWERPC_750:
case CPU_SUBTYPE_POWERPC_7400:
case CPU_SUBTYPE_POWERPC_7450:
Oops, something went wrong.

0 comments on commit 61da2ee

Please sign in to comment.