mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
a1a5bc28c2
Mixed line endings cause problems when exporting patches with git-format-patch and then trying to "git am" a patch with mixed and non-matching line endings. In such a situation git will fail to apply the patch. This commit runs the dos2unix tools on the remaining files with CRLF (\r\n) line endings to convert them to line-feeds (\n) only. Files that are Windows specific like *.vcxproj and *.props files were not converted. Closes: #3073
69 lines
1.2 KiB
C++
69 lines
1.2 KiB
C++
/*
|
|
* CStopWatch.h, part of VCMI engine
|
|
*
|
|
* Authors: listed in file AUTHORS in main folder
|
|
*
|
|
* License: GNU General Public License v2.0 or later
|
|
* Full text of license available in license.txt file, in main folder
|
|
*
|
|
*/
|
|
#pragma once
|
|
|
|
#ifdef __FreeBSD__
|
|
#include <sys/types.h>
|
|
#include <sys/time.h>
|
|
#include <sys/resource.h>
|
|
#define TO_MS_DIVISOR (1000)
|
|
#else
|
|
#include <ctime>
|
|
#define TO_MS_DIVISOR (CLOCKS_PER_SEC / 1000)
|
|
#endif
|
|
|
|
VCMI_LIB_NAMESPACE_BEGIN
|
|
|
|
class CStopWatch
|
|
{
|
|
si64 start, last, mem;
|
|
|
|
public:
|
|
CStopWatch()
|
|
: start(clock())
|
|
{
|
|
last=clock();
|
|
mem=0;
|
|
}
|
|
|
|
si64 getDiff() //get diff in milliseconds
|
|
{
|
|
si64 ret = clock() - last;
|
|
last = clock();
|
|
return ret / TO_MS_DIVISOR;
|
|
}
|
|
void update()
|
|
{
|
|
last=clock();
|
|
}
|
|
void remember()
|
|
{
|
|
mem=clock();
|
|
}
|
|
si64 memDif()
|
|
{
|
|
return (clock()-mem) / TO_MS_DIVISOR;
|
|
}
|
|
|
|
private:
|
|
si64 clock()
|
|
{
|
|
#ifdef __FreeBSD__ // TODO: enable also for Apple?
|
|
struct rusage usage;
|
|
getrusage(RUSAGE_SELF, &usage);
|
|
return static_cast<si64>(usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * 1000000 + usage.ru_utime.tv_usec + usage.ru_stime.tv_usec;
|
|
#else
|
|
return std::clock();
|
|
#endif
|
|
}
|
|
};
|
|
|
|
VCMI_LIB_NAMESPACE_END
|