Kayne Ruse
ce16fc6969
Conflicts: server/server_logic.cpp Finally merging the changes to develop. This is only the ConfigUtility skipping missing files, and something with the Timer class, that I'll need to test the collisions.
46 lines
1.3 KiB
C++
46 lines
1.3 KiB
C++
/* Copyright: (c) Kayne Ruse 2013-2015
|
|
*
|
|
* 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 acknowledgment 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.
|
|
*/
|
|
#include "timer.hpp"
|
|
|
|
Timer::Timer(): start(Timer::Clock::now()) {
|
|
//
|
|
}
|
|
|
|
Timer::Timer(std::string s): name(s), start(Timer::Clock::now()) {
|
|
//
|
|
}
|
|
|
|
void Timer::Start() {
|
|
start = Clock::now();
|
|
}
|
|
|
|
void Timer::Stop() {
|
|
timeSpan = Clock::now() - start;
|
|
}
|
|
|
|
std::ostream& operator<<(std::ostream& os, Timer& t) {
|
|
os << t.GetName() << ": ";
|
|
os << std::chrono::duration_cast<std::chrono::microseconds>(t.GetTime()).count();
|
|
os << "us";
|
|
return os;
|
|
}
|