Attachment #327954 for bug #425450

View | Details | Raw Unified | Return to bug 425450
Collapse All | Expand All

Lines 1547-1553 Link Here

(-)source/backend/scene/view.cpp (-1 / +1 lines)
1547	}	1547	}
1548		1548
1549	boost::xtime t;	1549	boost::xtime t;
1550	boost::xtime_get (&t, boost::TIME_UTC);	1550	boost::xtime_get (&t, boost::TIME_UTC_);
1551	t.sec += 3;	1551	t.sec += 3;
1552		1552
1553	// this will cause us to wait until the other threads are done.	1553	// this will cause us to wait until the other threads are done.




POV_LONG TimerDefault::ElapsedRealTime() const
{
	boost::xtime t;
	boost::xtime_get(&t, boost::TIME_UTC_);
	POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec);
	POV_LONG st = (POV_LONG)(realTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(realTimeStart.nsec);
	return ((tt - st) / (POV_LONG)(1000000));

POV_LONG TimerDefault::ElapsedCPUTime() const
{
	boost::xtime t;
	boost::xtime_get(&t, boost::TIME_UTC_);
	POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec);
	POV_LONG st = (POV_LONG)(cpuTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(cpuTimeStart.nsec);
	return ((tt - st) / (POV_LONG)(1000000));


void TimerDefault::Reset()
{
	boost::xtime_get(&realTimeStart, boost::TIME_UTC_);
	boost::xtime_get(&cpuTimeStart, boost::TIME_UTC_);
}

}

void Delay(unsigned int msec)
{
	boost::xtime t;
	boost::xtime_get(&t, boost::TIME_UTC_);
	POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);
	t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));
	t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));

Lines 126-132 Link Here

(-)vfe/unix/platformbase.cpp (-1 / +1 lines)
126	#else	126	#else
127	// taken from source/base/timer.cpp	127	// taken from source/base/timer.cpp
128	boost::xtime t;	128	boost::xtime t;
129	boost::xtime_get(&t, boost::TIME_UTC);	129	boost::xtime_get(&t, boost::TIME_UTC_);
130	POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);	130	POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);
131	t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));	131	t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));
132	t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));	132	t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));

Lines 247-253 Link Here

(-)vfe/vfepovms.cpp (-1 / +1 lines)
247		247
248	// TODO: have a shorter wait but loop, and check for system shutdown	248	// TODO: have a shorter wait but loop, and check for system shutdown
249	boost::xtime t;	249	boost::xtime t;
250	boost::xtime_get (&t, boost::TIME_UTC);	250	boost::xtime_get (&t, boost::TIME_UTC_);
251	t.nsec += 50000000 ;	251	t.nsec += 50000000 ;
252	m_Event.timed_wait (lock, t);	252	m_Event.timed_wait (lock, t);
253		253




  if (WaitTime > 0)
  {
    boost::xtime t;
    boost::xtime_get (&t, boost::TIME_UTC_);
    t.sec += WaitTime / 1000 ;
    t.nsec += (WaitTime % 1000) * 1000000 ;
    m_SessionEvent.timed_wait (lock, t);

  // we can't call pause directly since it will result in a thread context
  // error. pause must be called from the context of the worker thread.
  boost::xtime t;
  boost::xtime_get (&t, boost::TIME_UTC_);
  t.sec += 3 ;
  m_RequestFlag = rqPauseRequest;
  if (m_RequestEvent.timed_wait(lock, t) == false)

  // we can't call resume directly since it will result in a thread context
  // error. it must be called from the context of the worker thread.
  boost::xtime t;
  boost::xtime_get (&t, boost::TIME_UTC_);
  t.sec += 3 ;
  m_RequestFlag = rqResumeRequest;
  if (m_RequestEvent.timed_wait(lock, t) == false)

  m_LastError = vfeNoError;

  boost::xtime t;
  boost::xtime_get (&t, boost::TIME_UTC_);
  t.sec += 3 ;
#ifdef _DEBUG
  t.sec += 120;

Return to bug 425450

Lines 967-973 Link Here

(-)vfe/vfesession.cpp (-4 / +4 lines)
967	if (WaitTime > 0)	967	if (WaitTime > 0)
968	{	968	{
969	boost::xtime t;	969	boost::xtime t;
970	boost::xtime_get (&t, boost::TIME_UTC);	970	boost::xtime_get (&t, boost::TIME_UTC_);
971	t.sec += WaitTime / 1000 ;	971	t.sec += WaitTime / 1000 ;
972	t.nsec += (WaitTime % 1000) * 1000000 ;	972	t.nsec += (WaitTime % 1000) * 1000000 ;
973	m_SessionEvent.timed_wait (lock, t);	973	m_SessionEvent.timed_wait (lock, t);
Lines 1034-1040 Link Here
1034	// we can't call pause directly since it will result in a thread context	1034	// we can't call pause directly since it will result in a thread context
1035	// error. pause must be called from the context of the worker thread.	1035	// error. pause must be called from the context of the worker thread.
1036	boost::xtime t;	1036	boost::xtime t;
1037	boost::xtime_get (&t, boost::TIME_UTC);	1037	boost::xtime_get (&t, boost::TIME_UTC_);
1038	t.sec += 3 ;	1038	t.sec += 3 ;
1039	m_RequestFlag = rqPauseRequest;	1039	m_RequestFlag = rqPauseRequest;
1040	if (m_RequestEvent.timed_wait(lock, t) == false)	1040	if (m_RequestEvent.timed_wait(lock, t) == false)
Lines 1057-1063 Link Here
1057	// we can't call resume directly since it will result in a thread context	1057	// we can't call resume directly since it will result in a thread context
1058	// error. it must be called from the context of the worker thread.	1058	// error. it must be called from the context of the worker thread.
1059	boost::xtime t;	1059	boost::xtime t;
1060	boost::xtime_get (&t, boost::TIME_UTC);	1060	boost::xtime_get (&t, boost::TIME_UTC_);
1061	t.sec += 3 ;	1061	t.sec += 3 ;
1062	m_RequestFlag = rqResumeRequest;	1062	m_RequestFlag = rqResumeRequest;
1063	if (m_RequestEvent.timed_wait(lock, t) == false)	1063	if (m_RequestEvent.timed_wait(lock, t) == false)
Lines 1123-1129 Link Here
1123	m_LastError = vfeNoError;	1123	m_LastError = vfeNoError;
1124		1124
1125	boost::xtime t;	1125	boost::xtime t;
1126	boost::xtime_get (&t, boost::TIME_UTC);	1126	boost::xtime_get (&t, boost::TIME_UTC_);
1127	t.sec += 3 ;	1127	t.sec += 3 ;
1128	#ifdef _DEBUG	1128	#ifdef _DEBUG
1129	t.sec += 120;	1129	t.sec += 120;

Lines 117-123 Link Here

(-)source/base/timer.cpp (-5 / +5 lines)
117	POV_LONG TimerDefault::ElapsedRealTime() const	117	POV_LONG TimerDefault::ElapsedRealTime() const
118	{	118	{
119	boost::xtime t;	119	boost::xtime t;
120	boost::xtime_get(&t, boost::TIME_UTC);	120	boost::xtime_get(&t, boost::TIME_UTC_);
121	POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec);	121	POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec);
122	POV_LONG st = (POV_LONG)(realTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(realTimeStart.nsec);	122	POV_LONG st = (POV_LONG)(realTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(realTimeStart.nsec);
123	return ((tt - st) / (POV_LONG)(1000000));	123	return ((tt - st) / (POV_LONG)(1000000));
Lines 126-132 Link Here
126	POV_LONG TimerDefault::ElapsedCPUTime() const	126	POV_LONG TimerDefault::ElapsedCPUTime() const
127	{	127	{
128	boost::xtime t;	128	boost::xtime t;
129	boost::xtime_get(&t, boost::TIME_UTC);	129	boost::xtime_get(&t, boost::TIME_UTC_);
130	POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec);	130	POV_LONG tt = (POV_LONG)(t.sec) * (POV_LONG)(1000000000) + (POV_LONG)(t.nsec);
131	POV_LONG st = (POV_LONG)(cpuTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(cpuTimeStart.nsec);	131	POV_LONG st = (POV_LONG)(cpuTimeStart.sec) * (POV_LONG)(1000000000) + (POV_LONG)(cpuTimeStart.nsec);
132	return ((tt - st) / (POV_LONG)(1000000));	132	return ((tt - st) / (POV_LONG)(1000000));
Lines 139-146 Link Here
139		139
140	void TimerDefault::Reset()	140	void TimerDefault::Reset()
141	{	141	{
142	boost::xtime_get(&realTimeStart, boost::TIME_UTC);	142	boost::xtime_get(&realTimeStart, boost::TIME_UTC_);
143	boost::xtime_get(&cpuTimeStart, boost::TIME_UTC);	143	boost::xtime_get(&cpuTimeStart, boost::TIME_UTC_);
144	}	144	}
145		145
146	}	146	}
Lines 155-161 Link Here
155	void Delay(unsigned int msec)	155	void Delay(unsigned int msec)
156	{	156	{
157	boost::xtime t;	157	boost::xtime t;
158	boost::xtime_get(&t, boost::TIME_UTC);	158	boost::xtime_get(&t, boost::TIME_UTC_);
159	POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);	159	POV_ULONG ns = (POV_ULONG)(t.sec) * (POV_ULONG)(1000000000) + (POV_ULONG)(t.nsec) + (POV_ULONG)(msec) * (POV_ULONG)(1000000);
160	t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));	160	t.sec = (boost::xtime::xtime_sec_t)(ns / (POV_ULONG)(1000000000));
161	t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));	161	t.nsec = (boost::xtime::xtime_nsec_t)(ns % (POV_ULONG)(1000000000));