mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some missing from merge.

Browse source 
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 • committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
Download patch file Download diff file Expand all files Collapse all files

80
dep/acelite/ace/Time_Value.cpp
View file

@ -1,8 +1,6 @@
#include "ace/Time_Value.h"
// $Id: Time_Value.cpp 97886 2014-09-09 06:43:37Z johnnyw $
#if defined (ACE_HAS_ALLOC_HOOKS)
# include "ace/Malloc_Base.h"
#endif /* ACE_HAS_ALLOC_HOOKS */
#include "ace/Time_Value.h"
#if !defined (__ACE_INLINE__)
#include "ace/Time_Value.inl"
@ -18,8 +16,6 @@
# include <iomanip>
#endif /* ACE_HAS_CPP98_IOSTREAMS */
#include <cstdlib>
#ifdef ACE_HAS_CPP11
# include <cmath>
#endif /* ACE_HAS_CPP11 */
@ -176,30 +172,52 @@ ACE_Time_Value::dump (void) const
void
ACE_Time_Value::normalize (bool saturate)
{
// ACE_OS_TRACE ("ACE_Time_Value::normalize");
if (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS ||
this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS)
{
time_t const sec = std::abs(this->tv_.tv_usec) / ACE_ONE_SECOND_IN_USECS * (this->tv_.tv_usec > 0 ? 1 : -1);
suseconds_t const usec = static_cast<suseconds_t> (this->tv_.tv_usec - sec * ACE_ONE_SECOND_IN_USECS);
// // ACE_OS_TRACE ("ACE_Time_Value::normalize");
// From Hans Rohnert...
if (saturate && this->tv_.tv_sec > 0 && sec > 0 &&
ACE_Numeric_Limits<time_t>::max() - this->tv_.tv_sec < sec)
{
this->tv_.tv_sec = ACE_Numeric_Limits<time_t>::max();
this->tv_.tv_usec = ACE_ONE_SECOND_IN_USECS - 1;
}
else if (saturate && this->tv_.tv_sec < 0 && sec < 0 &&
ACE_Numeric_Limits<time_t>::min() - this->tv_.tv_sec > sec)
{
this->tv_.tv_sec = ACE_Numeric_Limits<time_t>::min();
this->tv_.tv_usec = -ACE_ONE_SECOND_IN_USECS + 1;
}
if (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS)
{
/*! \todo This loop needs some optimization.
*/
if (!saturate) // keep the conditionnal expression outside the while loop to minimize performance cost
do
{
++this->tv_.tv_sec;
this->tv_.tv_usec -= ACE_ONE_SECOND_IN_USECS;
}
while (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS);
else
{
this->tv_.tv_sec += sec;
this->tv_.tv_usec = usec;
}
do
if (this->tv_.tv_sec < ACE_Numeric_Limits<time_t>::max())
{
++this->tv_.tv_sec;
this->tv_.tv_usec -= ACE_ONE_SECOND_IN_USECS;
}
else
this->tv_.tv_usec = ACE_ONE_SECOND_IN_USECS - 1;
while (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS);
}
else if (this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS)
{
/*! \todo This loop needs some optimization.
*/
if (!saturate)
do
{
--this->tv_.tv_sec;
this->tv_.tv_usec += ACE_ONE_SECOND_IN_USECS;
}
while (this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS);
else
do
if (this->tv_.tv_sec > ACE_Numeric_Limits<time_t>::min())
{
--this->tv_.tv_sec;
this->tv_.tv_usec += ACE_ONE_SECOND_IN_USECS;
}
else
this->tv_.tv_usec = -ACE_ONE_SECOND_IN_USECS + 1;
while (this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS);
}
if (this->tv_.tv_sec >= 1 && this->tv_.tv_usec < 0)
@ -317,7 +335,7 @@ ACE_Time_Value::operator *= (double d)
#ifdef ACE_HAS_CPP98_IOSTREAMS
ostream &operator<<(ostream &o, const ACE_Time_Value &v)
{
char const oldFiller = o.fill ();
char oldFiller = o.fill ();
o.fill ('0');
const timeval *tv = v;
if (tv->tv_sec)
@ -325,9 +343,9 @@ ostream &operator<<(ostream &o, const ACE_Time_Value &v)
o << tv->tv_sec;
if (tv->tv_usec)
#ifdef ACE_HAS_CPP11
o << '.' << std::setw (6) << std::labs (tv->tv_usec);
o << '.' << std::setw (6) << std::abs (tv->tv_usec);
#else
o << '.' << std::setw (6) << ACE_STD_NAMESPACE::labs (tv->tv_usec);
o << '.' << std::setw (6) << ACE_STD_NAMESPACE::abs (tv->tv_usec);
#endif
}
else if (tv->tv_usec < 0)