projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r455: no message
[ctsim.git]
/
include
/
timer.h
diff --git
a/include/timer.h
b/include/timer.h
index 78b19e907358e73b768aebb05093ac4ac0b504fe..2200685db7cf338e698b891ae944824938d6db47 100644
(file)
--- a/
include/timer.h
+++ b/
include/timer.h
@@
-6,6
+6,10
@@
#include <sys/time.h>
#endif
#include <sys/time.h>
#endif
+#ifdef MSVC
+#include <sys/timeb.h>
+#endif
+
class Timer
{
public:
class Timer
{
public:
@@
-25,7
+29,7
@@
class Timer
virtual void timerReport (const char* const msg) const
{
virtual void timerReport (const char* const msg) const
{
-
cout << msg << ": " << m_timeElapsed << " seconds" <<
endl;
+
std::cout << msg << ": " << m_timeElapsed << " seconds" << std::
endl;
}
virtual double timerEndAndReport (const char* const msg)
}
virtual double timerEndAndReport (const char* const msg)
@@
-51,6
+55,10
@@
class Timer
return 0;
return (now.tv_sec + static_cast<double>(now.tv_usec) / 1000000.);
return 0;
return (now.tv_sec + static_cast<double>(now.tv_usec) / 1000000.);
+#elif defined(MSVC)
+ struct _timeb now;
+ _ftime (&now);
+ return (now.time + static_cast<double>(now.millitm) / 1000.);
#else
return 0;
#endif
#else
return 0;
#endif
@@
-85,7
+93,7
@@
class TimerMPI : public Timer
virtual void timerReport (const char* const msg)
{
if (m_comm.Get_rank() == 0)
virtual void timerReport (const char* const msg)
{
if (m_comm.Get_rank() == 0)
-
cout << msg << ": " << m_timeElapsed << " seconds" <<
endl;
+
std::cout << msg << ": " << m_timeElapsed << " seconds" << std::
endl;
}
virtual double timerEndAndReport (const char* const msg)
}
virtual double timerEndAndReport (const char* const msg)
@@
-137,12
+145,12
@@
class TimerCollectiveMPI : public TimerMPI
virtual void timerReport (const char* const msg)
{
if (m_comm.Get_rank() == 0)
virtual void timerReport (const char* const msg)
{
if (m_comm.Get_rank() == 0)
-
cout << msg << " " << "Minimum=" << m_timeMin << ", Maximum=" << m_timeMax << " seconds" <<
endl;
+
std::cout << msg << " " << "Minimum=" << m_timeMin << ", Maximum=" << m_timeMax << " seconds" << std::
endl;
}
virtual void timerReportAllProcesses (const char* const msg)
{
}
virtual void timerReportAllProcesses (const char* const msg)
{
-
cout << msg << ": " << "Minimum=" << m_timeMin << ", Maximum=" << m_timeMax << " seconds (Rank " << m_comm.Get_rank() << ")" <<
endl;
+
std::cout << msg << ": " << "Minimum=" << m_timeMin << ", Maximum=" << m_timeMax << " seconds (Rank " << m_comm.Get_rank() << ")" << std::
endl;
}
private:
}
private: