openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92 from OpenShot/revert-86-ZmgLogger_hires_timestamp

Browse Source 
Revert "Check in code to handle missing clock_gettime() on most versions of M…"
This commit is contained in:
Jonathan Thomas
2018-05-19 01:25:00 -05:00
committed by GitHub
parent b54e1dd88f 9d755c6d68
commit b5704c4a25
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/ZmqLogger.h
View File

@@ -41,12 +41,6 @@
#include <zmq.hpp>
#include <unistd.h>
// OS X does not have clock_gettime, use clock_get_time (https://gist.github.com/jbenet/1087739)
#ifdef __MACH__
#include <mach/clock.h>
#include <mach/mach.h>
#endif
using namespace std;

18
src/ZmqLogger.cpp
View File

@@ -176,24 +176,6 @@ void ZmqLogger::AppendDebugMethod(string method_name, string arg1_name, float ar
stringstream message;
message << fixed << setprecision(4);
// Prepend current time (hires) to message
struct timespec ts;
#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time (https://gist.github.com/jbenet/1087739)
clock_serv_t cclock;
mach_timespec_t mts;
host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
clock_get_time(cclock, &mts);
mach_port_deallocate(mach_task_self(), cclock);
ts->tv_sec = mts.tv_sec;
ts->tv_nsec = mts.tv_nsec;
#else
clock_gettime(CLOCK_REALTIME, &ts);
#endif
char timebuf[80];
strftime(timebuf, sizeof timebuf, "%F %T", localtime(&ts.tv_sec));
message << timebuf << "." << std::setiosflags(std::ios::right) << std::setw(9) << std::setfill('0') << ts.tv_nsec << " ";
message << method_name << " (";
// Add attributes to method JSON