From d34e6ff86483125a0ac9e554ad7f5a323688546c Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 16 Apr 2014 12:01:41 -0700
Subject: [PATCH 01/11] Removed gettimeofday in AudioInjector

---
 libraries/audio/src/AudioInjector.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index 6370e51826..eed41ac849 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -71,8 +71,8 @@ void AudioInjector::injectAudio() {
         quint8 volume = MAX_INJECTOR_VOLUME * _options.getVolume();
         packetStream << volume;
         
-        timeval startTime = {};
-        gettimeofday(&startTime, NULL);
+        QElapsedTimer timer;
+        timer.start();
         int nextFrame = 0;
         
         int currentSendPosition = 0;
@@ -104,7 +104,7 @@ void AudioInjector::injectAudio() {
             if (currentSendPosition != bytesToCopy && currentSendPosition < soundByteArray.size()) {
                 // not the first packet and not done
                 // sleep for the appropriate time
-                int usecToSleep = usecTimestamp(&startTime) + (++nextFrame * BUFFER_SEND_INTERVAL_USECS) - usecTimestampNow();
+                int usecToSleep = (++nextFrame * BUFFER_SEND_INTERVAL_USECS) - timer.nsecsElapsed() / 1000;
                 
                 if (usecToSleep > 0) {
                     usleep(usecToSleep);

From 8cfc8faa019bf5a583fd8bcb93ea47627800f060 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 16 Apr 2014 12:08:17 -0700
Subject: [PATCH 02/11] Removed gettimeofday in Audio

---
 interface/src/Audio.cpp | 13 +++++--------
 interface/src/Audio.h   |  3 ++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index 5dcd54050c..c7f7c2c354 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -616,12 +616,11 @@ void Audio::handleAudioInput() {
 void Audio::addReceivedAudioToBuffer(const QByteArray& audioByteArray) {
     const int NUM_INITIAL_PACKETS_DISCARD = 3;
     const int STANDARD_DEVIATION_SAMPLE_COUNT = 500;
-
-    timeval currentReceiveTime;
-    gettimeofday(&currentReceiveTime, NULL);
+    
+    _timeSinceLastRecieved.start();
     _totalPacketsReceived++;
-
-    double timeDiff = diffclock(&_lastReceiveTime, &currentReceiveTime);
+    
+    double timeDiff = (double)_timeSinceLastRecieved.nsecsElapsed() / 1000000.0; // ns to ms
     
     //  Discard first few received packets for computing jitter (often they pile up on start)
     if (_totalPacketsReceived > NUM_INITIAL_PACKETS_DISCARD) {
@@ -646,8 +645,6 @@ void Audio::addReceivedAudioToBuffer(const QByteArray& audioByteArray) {
     }
 
     Application::getInstance()->getBandwidthMeter()->inputStream(BandwidthMeter::AUDIO).updateValue(audioByteArray.size());
-
-    _lastReceiveTime = currentReceiveTime;
 }
 
 bool Audio::mousePressEvent(int x, int y) {
@@ -995,7 +992,7 @@ bool Audio::switchOutputToAudioDevice(const QAudioDeviceInfo& outputDeviceInfo)
             // setup a procedural audio output device
             _proceduralAudioOutput = new QAudioOutput(outputDeviceInfo, _outputFormat, this);
 
-            gettimeofday(&_lastReceiveTime, NULL);
+            _timeSinceLastRecieved.start();
             supportedFormat = true;
         }
     }
diff --git a/interface/src/Audio.h b/interface/src/Audio.h
index b78bcc661e..3fa4175573 100644
--- a/interface/src/Audio.h
+++ b/interface/src/Audio.h
@@ -23,6 +23,7 @@
 
 #include <QAudio>
 #include <QAudioInput>
+#include <QElapsedTimer>
 #include <QGLWidget>
 #include <QtCore/QObject>
 #include <QtCore/QVector>
@@ -123,7 +124,7 @@ private:
     QString _outputAudioDeviceName;
     
     StDev _stdev;
-    timeval _lastReceiveTime;
+    QElapsedTimer _timeSinceLastRecieved;
     float _averagedLatency;
     float _measuredJitter;
     int16_t _jitterBufferSamples;

From dd8a0e355055476af97f6f668d451b4182e4e5a4 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 16 Apr 2014 12:16:49 -0700
Subject: [PATCH 03/11] Removed gettimeofday in AudioMixer

---
 assignment-client/src/audio/AudioMixer.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 407a64d7a8..65d09f1b00 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -389,9 +389,8 @@ void AudioMixer::run() {
     nodeList->linkedDataCreateCallback = attachNewBufferToNode;
 
     int nextFrame = 0;
-    timeval startTime;
-
-    gettimeofday(&startTime, NULL);
+    QElapsedTimer timer;
+    timer.start();
     
     char* clientMixBuffer = new char[NETWORK_BUFFER_LENGTH_BYTES_STEREO
                                      + numBytesForPacketHeaderGivenPacketType(PacketTypeMixedAudio)];
@@ -490,7 +489,7 @@ void AudioMixer::run() {
             break;
         }
 
-        usecToSleep = usecTimestamp(&startTime) + (++nextFrame * BUFFER_SEND_INTERVAL_USECS) - usecTimestampNow();
+        usecToSleep = (++nextFrame * BUFFER_SEND_INTERVAL_USECS) - timer.nsecsElapsed() / 1000; // ns to us
 
         if (usecToSleep > 0) {
             usleep(usecToSleep);

From f7f30e118c4f1b36178a3e0d4f4bd603f4519221 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 21 Apr 2014 15:17:11 -0700
Subject: [PATCH 04/11] More gettimeofday cleanup

---
 interface/src/Application.cpp                | 27 ++++-----
 interface/src/Application.h                  |  8 +--
 interface/src/Util.cpp                       | 47 +++++----------
 interface/src/Util.h                         |  2 -
 interface/src/main.cpp                       |  6 +-
 interface/src/starfield/Controller.cpp       | 10 ++--
 interface/src/starfield/Generator.cpp        |  9 ++-
 interface/src/ui/BandwidthMeter.cpp          | 13 ++---
 interface/src/ui/BandwidthMeter.h            |  4 +-
 libraries/script-engine/src/ScriptEngine.cpp |  6 +-
 libraries/shared/src/SharedUtil.cpp          |  4 --
 libraries/shared/src/SharedUtil.h            |  1 -
 libraries/shared/src/Systime.cpp             | 61 --------------------
 libraries/shared/src/Systime.h               | 27 ---------
 14 files changed, 57 insertions(+), 168 deletions(-)
 delete mode 100644 libraries/shared/src/Systime.cpp
 delete mode 100644 libraries/shared/src/Systime.h

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index cd07f21300..92c63dacf3 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -134,7 +134,7 @@ QString& Application::resourcesPath() {
     return staticResourcePath;
 }
 
-Application::Application(int& argc, char** argv, timeval &startup_time) :
+Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
         QApplication(argc, argv),
         _window(new QMainWindow(desktop())),
         _glWidget(new GLCanvas()),
@@ -507,7 +507,7 @@ void Application::initializeGL() {
     _idleLoopStdev.reset();
 
     if (_justStarted) {
-        float startupTime = (usecTimestampNow() - usecTimestamp(&_applicationStartupTime)) / 1000000.0;
+        float startupTime = _applicationStartupTime.elapsed() / 1000.0;
         _justStarted = false;
         qDebug("Startup time: %4.2f seconds.", startupTime);
         const char LOGSTASH_INTERFACE_START_TIME_KEY[] = "interface-start-time";
@@ -1273,21 +1273,21 @@ void Application::sendPingPackets() {
 
 //  Every second, check the frame rates and other stuff
 void Application::timer() {
-    gettimeofday(&_timerEnd, NULL);
-
     if (Menu::getInstance()->isOptionChecked(MenuOption::TestPing)) {
         sendPingPackets();
     }
+    
+    float diffTime = (float)_timerStart.nsecsElapsed() / 1000000000.0;
 
-    _fps = (float)_frameCount / ((float)diffclock(&_timerStart, &_timerEnd) / 1000.f);
+    _fps = (float)_frameCount / diffTime;
 
-    _packetsPerSecond = (float) _datagramProcessor.getPacketCount() / ((float)diffclock(&_timerStart, &_timerEnd) / 1000.f);
-    _bytesPerSecond = (float) _datagramProcessor.getByteCount() / ((float)diffclock(&_timerStart, &_timerEnd) / 1000.f);
+    _packetsPerSecond = (float) _datagramProcessor.getPacketCount() / diffTime;
+    _bytesPerSecond = (float) _datagramProcessor.getByteCount() / diffTime;
     _frameCount = 0;
 
     _datagramProcessor.resetCounters();
 
-    gettimeofday(&_timerStart, NULL);
+    _timerStart.start();
 
     // ask the node list to check in with the domain server
     NodeList::getInstance()->sendDomainServerCheckIn();
@@ -1300,13 +1300,11 @@ void Application::idle() {
     bool showWarnings = getLogger()->extraDebugging();
     PerformanceWarning warn(showWarnings, "Application::idle()");
 
-    timeval check;
-    gettimeofday(&check, NULL);
-
     //  Only run simulation code if more than IDLE_SIMULATE_MSECS have passed since last time we ran
 
-    double timeSinceLastUpdate = diffclock(&_lastTimeUpdated, &check);
+    double timeSinceLastUpdate = (double)_lastTimeUpdated.nsecsElapsed() / 1000000.0;
     if (timeSinceLastUpdate > IDLE_SIMULATE_MSECS) {
+        _lastTimeUpdated.start();
         {
             PerformanceWarning warn(showWarnings, "Application::idle()... update()");
             const float BIGGEST_DELTA_TIME_SECS = 0.25f;
@@ -1318,7 +1316,6 @@ void Application::idle() {
         }
         {
             PerformanceWarning warn(showWarnings, "Application::idle()... rest of it");
-            _lastTimeUpdated = check;
             _idleLoopStdev.addValue(timeSinceLastUpdate);
 
             //  Record standard deviation and reset counter if needed
@@ -1634,8 +1631,8 @@ void Application::init() {
                                   Qt::QueuedConnection);
     }
 
-    gettimeofday(&_timerStart, NULL);
-    gettimeofday(&_lastTimeUpdated, NULL);
+    _timerStart.start();
+    _lastTimeUpdated.start();
 
     Menu::getInstance()->loadSettings();
     if (Menu::getInstance()->getAudioJitterBufferSamples() != 0) {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 9d609ad5f5..36758a26db 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -117,7 +117,7 @@ public:
     static Application* getInstance() { return static_cast<Application*>(QCoreApplication::instance()); }
     static QString& resourcesPath();
 
-    Application(int& argc, char** argv, timeval &startup_time);
+    Application(int& argc, char** argv, QElapsedTimer &startup_time);
     ~Application();
 
     void restoreSizeAndPosition();
@@ -391,9 +391,9 @@ private:
 
     int _frameCount;
     float _fps;
-    timeval _applicationStartupTime;
-    timeval _timerStart, _timerEnd;
-    timeval _lastTimeUpdated;
+    QElapsedTimer _applicationStartupTime;
+    QElapsedTimer _timerStart;
+    QElapsedTimer _lastTimeUpdated;
     bool _justStarted;
     Stars _stars;
 
diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp
index 1dae3a4fd6..9dfe9d8002 100644
--- a/interface/src/Util.cpp
+++ b/interface/src/Util.cpp
@@ -172,14 +172,6 @@ void renderWorldBox() {
 
 }
 
-double diffclock(timeval *clock1,timeval *clock2)
-{
-	double diffms = (clock2->tv_sec - clock1->tv_sec) * 1000.0;
-    diffms += (clock2->tv_usec - clock1->tv_usec) / 1000.0;   // us to ms
-
-	return diffms;
-}
-
 //  Return a random vector of average length 1
 const glm::vec3 randVector() {
     return glm::vec3(randFloat() - 0.5f, randFloat() - 0.5f, randFloat() - 0.5f) * 2.f;
@@ -411,68 +403,61 @@ void runTimingTests() {
     int iResults[numTests];
     float fTest = 1.0;
     float fResults[numTests];
-    timeval startTime, endTime;
+    QElapsedTimer startTime;
+    startTime.start();
     float elapsedMsecs;
-    gettimeofday(&startTime, NULL);
-    for (int i = 1; i < numTests; i++) {
-        gettimeofday(&endTime, NULL);
-    }
-    elapsedMsecs = diffclock(&startTime, &endTime);
-    qDebug("gettimeofday() usecs: %f", 1000.0f * elapsedMsecs / (float) numTests);
+    
+    elapsedMsecs = (float)startTime.nsecsElapsed() / 1000.0;
+    qDebug("QElapsedTimer::nsecElapsed() usecs: %f", 1000.0f * elapsedMsecs / (float) numTests);
     
     // Random number generation
-    gettimeofday(&startTime, NULL);
+    startTime.start();
     for (int i = 1; i < numTests; i++) {
         iResults[i] = rand();
     }
-    gettimeofday(&endTime, NULL);
-    elapsedMsecs = diffclock(&startTime, &endTime);
+    elapsedMsecs = (float)startTime.nsecsElapsed() / 1000.0;
     qDebug("rand() stored in array usecs: %f, first result:%d", 1000.0f * elapsedMsecs / (float) numTests, iResults[0]);
 
     // Random number generation using randFloat()
-    gettimeofday(&startTime, NULL);
+    startTime.start();
     for (int i = 1; i < numTests; i++) {
         fResults[i] = randFloat();
     }
-    gettimeofday(&endTime, NULL);
-    elapsedMsecs = diffclock(&startTime, &endTime);
+    elapsedMsecs = (float)startTime.nsecsElapsed() / 1000.0;
     qDebug("randFloat() stored in array usecs: %f, first result: %f", 1000.0f * elapsedMsecs / (float) numTests, fResults[0]);
 
     //  PowF function
     fTest = 1145323.2342f;
-    gettimeofday(&startTime, NULL);
+    startTime.start();
     for (int i = 1; i < numTests; i++) {
         fTest = powf(fTest, 0.5f);
     }
-    gettimeofday(&endTime, NULL);
-    elapsedMsecs = diffclock(&startTime, &endTime);
+    elapsedMsecs = (float)startTime.nsecsElapsed() / 1000.0;
     qDebug("powf(f, 0.5) usecs: %f", 1000.0f * elapsedMsecs / (float) numTests);
 
     //  Vector Math
     float distance;
     glm::vec3 pointA(randVector()), pointB(randVector());
-    gettimeofday(&startTime, NULL);
+    startTime.start();
     for (int i = 1; i < numTests; i++) {
         //glm::vec3 temp = pointA - pointB;
         //float distanceSquared = glm::dot(temp, temp);
         distance = glm::distance(pointA, pointB);
     }
-    gettimeofday(&endTime, NULL);
-    elapsedMsecs = diffclock(&startTime, &endTime);
+    elapsedMsecs = (float)startTime.nsecsElapsed() / 1000.0;
     qDebug("vector math usecs: %f [%f msecs total for %d tests], last result:%f",
              1000.0f * elapsedMsecs / (float) numTests, elapsedMsecs, numTests, distance);
 
     //  Vec3 test
     glm::vec3 vecA(randVector()), vecB(randVector());
     float result;
-
-    gettimeofday(&startTime, NULL);
+    
+    startTime.start();
     for (int i = 1; i < numTests; i++) {
         glm::vec3 temp = vecA-vecB;
         result = glm::dot(temp,temp);
     }
-    gettimeofday(&endTime, NULL);
-    elapsedMsecs = diffclock(&startTime, &endTime);
+    elapsedMsecs = (float)startTime.nsecsElapsed() / 1000.0;
     qDebug("vec3 assign and dot() usecs: %f, last result:%f", 1000.0f * elapsedMsecs / (float) numTests, result);
 }
 
diff --git a/interface/src/Util.h b/interface/src/Util.h
index 4bd1ed604c..dee0f864b4 100644
--- a/interface/src/Util.h
+++ b/interface/src/Util.h
@@ -44,8 +44,6 @@ void drawVector(glm::vec3* vector);
 
 void printVector(glm::vec3 vec);
 
-double diffclock(timeval *clock1,timeval *clock2);
-
 void renderCollisionOverlay(int width, int height, float magnitude, float red = 0, float blue = 0, float green = 0);
 
 void renderOrientationDirections( glm::vec3 position, const glm::quat& orientation, float size );
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 40e2a9ab27..2bb0633f24 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -16,8 +16,8 @@
 #include <SharedUtil.h>
 
 int main(int argc, const char * argv[]) {
-    timeval startup_time;
-    gettimeofday(&startup_time, NULL);
+    QElapsedTimer startupTime;
+    startupTime.start();
     
     // Debug option to demonstrate that the client's local time does not 
     // need to be in sync with any other network node. This forces clock 
@@ -33,7 +33,7 @@ int main(int argc, const char * argv[]) {
     int exitCode;
     {
         QSettings::setDefaultFormat(QSettings::IniFormat);
-        Application app(argc, const_cast<char**>(argv), startup_time);
+        Application app(argc, const_cast<char**>(argv), startupTime);
 
         QTranslator translator;
         translator.load("interface_en");
diff --git a/interface/src/starfield/Controller.cpp b/interface/src/starfield/Controller.cpp
index 771029c689..2476c33d45 100755
--- a/interface/src/starfield/Controller.cpp
+++ b/interface/src/starfield/Controller.cpp
@@ -13,20 +13,22 @@
 #include <Systime.h>
 #endif
 
+#include <QElapsedTimer>
+
 #include "starfield/Controller.h"
 
 using namespace starfield;
 
 bool Controller::computeStars(unsigned numStars, unsigned seed) {
-    timeval startTime;
-    gettimeofday(&startTime, NULL);
+    QElapsedTimer startTime;
+    startTime.start();
     
     Generator::computeStarPositions(_inputSequence, numStars, seed);
     
     this->retile(numStars, _tileResolution);
     
-    qDebug() << "Total time to retile and generate stars: "
-        << ((usecTimestampNow() - usecTimestamp(&startTime)) / 1000) << "msec";
+    double timeDiff = (double)startTime.nsecsElapsed() / 1000000.0; // ns to ms
+    qDebug() << "Total time to retile and generate stars: " << timeDiff << "msec";
     
     return true;
 }
diff --git a/interface/src/starfield/Generator.cpp b/interface/src/starfield/Generator.cpp
index b18e1834be..869abc90a5 100644
--- a/interface/src/starfield/Generator.cpp
+++ b/interface/src/starfield/Generator.cpp
@@ -13,6 +13,8 @@
 #include <Systime.h>
 #endif
 
+#include <QElapsedTimer>
+
 #include "starfield/Generator.h"
 
 using namespace starfield;
@@ -24,8 +26,8 @@ void Generator::computeStarPositions(InputVertices& destination, unsigned limit,
     InputVertices* vertices = & destination;
     //_limit = limit;
     
-    timeval startTime;
-    gettimeofday(&startTime, NULL);
+    QElapsedTimer startTime;
+    startTime.start();
     
     srand(seed);
     
@@ -70,7 +72,8 @@ void Generator::computeStarPositions(InputVertices& destination, unsigned limit,
         vertices->push_back(InputVertex(azimuth, altitude, computeStarColor(STAR_COLORIZATION)));
     }
     
-    qDebug() << "Total time to generate stars: " << ((usecTimestampNow() - usecTimestamp(&startTime)) / 1000) << " msec";
+    double timeDiff = (double)startTime.nsecsElapsed() / 1000000.0; // ns to ms
+    qDebug() << "Total time to generate stars: " << timeDiff << " msec";
 }
 
 // computeStarColor
diff --git a/interface/src/ui/BandwidthMeter.cpp b/interface/src/ui/BandwidthMeter.cpp
index 3ed66c53e1..0f41a1a5cf 100644
--- a/interface/src/ui/BandwidthMeter.cpp
+++ b/interface/src/ui/BandwidthMeter.cpp
@@ -62,26 +62,21 @@ BandwidthMeter::~BandwidthMeter() {
     free(_channels);
 }
 
-BandwidthMeter::Stream::Stream(float msToAverage) :
-    _value(0.0f),
-    _msToAverage(msToAverage) {
-
-    gettimeofday(& _prevTime, NULL);
+BandwidthMeter::Stream::Stream(float msToAverage) : _value(0.0f), _msToAverage(msToAverage) {
+    _prevTime.start();
 }
 
 void BandwidthMeter::Stream::updateValue(double amount) {
 
     // Determine elapsed time
-    timeval now;
-    gettimeofday(& now, NULL);
-    double dt = diffclock(& _prevTime, & now);
+    double dt = (double)_prevTime.nsecsElapsed() / 1000000.0; // ns to ms
 
     // Ignore this value when timer imprecision yields dt = 0
     if (dt == 0.0) {
         return;
     }
 
-    memcpy(& _prevTime, & now, sizeof(timeval));
+    _prevTime.start();
 
     // Compute approximate average
     _value = glm::mix(_value, amount / dt,
diff --git a/interface/src/ui/BandwidthMeter.h b/interface/src/ui/BandwidthMeter.h
index 6838f28c70..6cf7e9ea63 100644
--- a/interface/src/ui/BandwidthMeter.h
+++ b/interface/src/ui/BandwidthMeter.h
@@ -16,6 +16,8 @@
 #include <Systime.h>
 #endif
 
+#include <QElapsedTimer>
+
 #include <glm/glm.hpp>
 
 #include "ui/TextRenderer.h"
@@ -59,7 +61,7 @@ public:
     private:
         double  _value;                 // Current value.
         double  _msToAverage;           // Milliseconds to average.
-        timeval _prevTime;              // Time of last feed.
+        QElapsedTimer _prevTime;              // Time of last feed.
     };
 
     // Data model accessors
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 684c55fbb0..dcf64dfe2c 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -273,8 +273,8 @@ void ScriptEngine::run() {
         qDebug() << "Uncaught exception at line" << line << ":" << result.toString();
     }
 
-    timeval startTime;
-    gettimeofday(&startTime, NULL);
+    QElapsedTimer startTime;
+    startTime.start();
 
     int thisFrame = 0;
 
@@ -283,7 +283,7 @@ void ScriptEngine::run() {
     qint64 lastUpdate = usecTimestampNow();
 
     while (!_isFinished) {
-        int usecToSleep = usecTimestamp(&startTime) + (thisFrame++ * SCRIPT_DATA_CALLBACK_USECS) - usecTimestampNow();
+        int usecToSleep = (thisFrame++ * SCRIPT_DATA_CALLBACK_USECS) - startTime.nsecsElapsed() / 1000; // nsec to usec
         if (usecToSleep > 0) {
             usleep(usecToSleep);
         }
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index f4e4b28f93..dca9426cb4 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -24,10 +24,6 @@
 #include "OctalCode.h"
 #include "SharedUtil.h"
 
-quint64 usecTimestamp(const timeval *time) {
-    return (time->tv_sec * 1000000 + time->tv_usec);
-}
-
 int usecTimestampNowAdjust = 0;
 void usecTimestampNowForceClockSkew(int clockSkew) {
     ::usecTimestampNowAdjust = clockSkew;
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index a8403d617c..87647a9e73 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -66,7 +66,6 @@ static const quint64 USECS_PER_SECOND = USECS_PER_MSEC * MSECS_PER_SECOND;
 
 const int BITS_IN_BYTE  = 8;
 
-quint64 usecTimestamp(const timeval *time);
 quint64 usecTimestampNow();
 void usecTimestampNowForceClockSkew(int clockSkew);
 
diff --git a/libraries/shared/src/Systime.cpp b/libraries/shared/src/Systime.cpp
deleted file mode 100644
index ab32821a0f..0000000000
--- a/libraries/shared/src/Systime.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-//  Systime.cpp
-//  libraries/shared/src
-//
-//  Copyright 2013 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifdef WIN32
-
-#include "Systime.h"
-
-/**
- * gettimeofday
- * Implementation according to:
- * The Open Group Base Specifications Issue 6
- * IEEE Std 1003.1, 2004 Edition
- */
-  
-/**
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- *  Contributed by:
- *  Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-/** Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */
-#define _W32_FT_OFFSET (116444736000000000ULL)
-
-int gettimeofday(timeval* p_tv, timezone* p_tz) {
-  
-  union {
-    unsigned long long ns100; /**time since 1 Jan 1601 in 100ns units */
-    FILETIME ft;
-  }  _now;
-
-  if (p_tv) {
-      GetSystemTimeAsFileTime (&_now.ft);
-      p_tv->tv_usec=(long)((_now.ns100 / 10ULL) % 1000000ULL );
-      p_tv->tv_sec= (long)((_now.ns100 - _W32_FT_OFFSET) / 10000000ULL);
-  }
-  
-  /** Always return 0 as per Open Group Base Specifications Issue 6.
-   Do not set errno on error.  */
-  return 0;
-}
-
-#endif
\ No newline at end of file
diff --git a/libraries/shared/src/Systime.h b/libraries/shared/src/Systime.h
deleted file mode 100644
index 3098f09ecd..0000000000
--- a/libraries/shared/src/Systime.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  Systime.h
-//  libraries/shared/src
-//
-//  Copyright 2013 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_Systime_h
-#define hifi_Systime_h
-
-#ifdef WIN32
-
-#include <winsock2.h>
-
-struct timezone {
-  int tz_minuteswest; /* minutes west of Greenwich */
-  int tz_dsttime; /* type of dst correction */
-};
-
-int gettimeofday(struct timeval* p_tv, struct timezone* p_tz);
-
-#endif
-
-#endif // hifi_Systime_h
\ No newline at end of file

From 0479aaba4651594b760979f0ed460665234d7f1e Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 21 Apr 2014 15:26:43 -0700
Subject: [PATCH 05/11] Some gettimeofday removal fixes

---
 interface/src/Application.cpp |  2 +-
 interface/src/Util.cpp        | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 92c63dacf3..b13013cbe2 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -507,7 +507,7 @@ void Application::initializeGL() {
     _idleLoopStdev.reset();
 
     if (_justStarted) {
-        float startupTime = _applicationStartupTime.elapsed() / 1000.0;
+        float startupTime = (float)_applicationStartupTime.elapsed() / 1000.0;
         _justStarted = false;
         qDebug("Startup time: %4.2f seconds.", startupTime);
         const char LOGSTASH_INTERFACE_START_TIME_KEY[] = "interface-start-time";
diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp
index 9dfe9d8002..7913ff2f47 100644
--- a/interface/src/Util.cpp
+++ b/interface/src/Util.cpp
@@ -405,26 +405,26 @@ void runTimingTests() {
     float fResults[numTests];
     QElapsedTimer startTime;
     startTime.start();
-    float elapsedMsecs;
+    float elapsedUsecs;
     
-    elapsedMsecs = (float)startTime.nsecsElapsed() / 1000.0;
-    qDebug("QElapsedTimer::nsecElapsed() usecs: %f", 1000.0f * elapsedMsecs / (float) numTests);
+    elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0;
+    qDebug("QElapsedTimer::nsecElapsed() usecs: %f", 1000.0f * elapsedUsecs / (float) numTests);
     
     // Random number generation
     startTime.start();
     for (int i = 1; i < numTests; i++) {
         iResults[i] = rand();
     }
-    elapsedMsecs = (float)startTime.nsecsElapsed() / 1000.0;
-    qDebug("rand() stored in array usecs: %f, first result:%d", 1000.0f * elapsedMsecs / (float) numTests, iResults[0]);
+    elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0;
+    qDebug("rand() stored in array usecs: %f, first result:%d", 1000.0f * elapsedUsecs / (float) numTests, iResults[0]);
 
     // Random number generation using randFloat()
     startTime.start();
     for (int i = 1; i < numTests; i++) {
         fResults[i] = randFloat();
     }
-    elapsedMsecs = (float)startTime.nsecsElapsed() / 1000.0;
-    qDebug("randFloat() stored in array usecs: %f, first result: %f", 1000.0f * elapsedMsecs / (float) numTests, fResults[0]);
+    elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0;
+    qDebug("randFloat() stored in array usecs: %f, first result: %f", 1000.0f * elapsedUsecs / (float) numTests, fResults[0]);
 
     //  PowF function
     fTest = 1145323.2342f;
@@ -432,8 +432,8 @@ void runTimingTests() {
     for (int i = 1; i < numTests; i++) {
         fTest = powf(fTest, 0.5f);
     }
-    elapsedMsecs = (float)startTime.nsecsElapsed() / 1000.0;
-    qDebug("powf(f, 0.5) usecs: %f", 1000.0f * elapsedMsecs / (float) numTests);
+    elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0;
+    qDebug("powf(f, 0.5) usecs: %f", 1000.0f * elapsedUsecs / (float) numTests);
 
     //  Vector Math
     float distance;
@@ -444,9 +444,9 @@ void runTimingTests() {
         //float distanceSquared = glm::dot(temp, temp);
         distance = glm::distance(pointA, pointB);
     }
-    elapsedMsecs = (float)startTime.nsecsElapsed() / 1000.0;
-    qDebug("vector math usecs: %f [%f msecs total for %d tests], last result:%f",
-             1000.0f * elapsedMsecs / (float) numTests, elapsedMsecs, numTests, distance);
+    elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0;
+    qDebug("vector math usecs: %f [%f usecs total for %d tests], last result:%f",
+             1000.0f * elapsedUsecs / (float) numTests, elapsedUsecs, numTests, distance);
 
     //  Vec3 test
     glm::vec3 vecA(randVector()), vecB(randVector());
@@ -457,8 +457,8 @@ void runTimingTests() {
         glm::vec3 temp = vecA-vecB;
         result = glm::dot(temp,temp);
     }
-    elapsedMsecs = (float)startTime.nsecsElapsed() / 1000.0;
-    qDebug("vec3 assign and dot() usecs: %f, last result:%f", 1000.0f * elapsedMsecs / (float) numTests, result);
+    elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0;
+    qDebug("vec3 assign and dot() usecs: %f, last result:%f", 1000.0f * elapsedUsecs / (float) numTests, result);
 }
 
 float loadSetting(QSettings* settings, const char* name, float defaultValue) {

From be2db49e08be2fa49faed4d0f62b3106b226d4cd Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 21 Apr 2014 16:44:21 -0700
Subject: [PATCH 06/11] Last touch to removing gettimeofday

---
 libraries/shared/src/SharedUtil.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index dca9426cb4..a13772d862 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -20,6 +20,7 @@
 #endif
 
 #include <QtCore/QDebug>
+#include <QDateTime>
 
 #include "OctalCode.h"
 #include "SharedUtil.h"
@@ -30,9 +31,8 @@ void usecTimestampNowForceClockSkew(int clockSkew) {
 }
 
 quint64 usecTimestampNow() {
-    timeval now;
-    gettimeofday(&now, NULL);
-    return (now.tv_sec * 1000000 + now.tv_usec) + ::usecTimestampNowAdjust;
+    qint64 msecSinceEpoch = QDateTime::currentMSecsSinceEpoch();
+    return msecSinceEpoch * 1000 + ::usecTimestampNowAdjust;
 }
 
 float randFloat() {

From fd20686f0f854a33d897c5973535fd57c2e1fd60 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 21 Apr 2014 17:23:06 -0700
Subject: [PATCH 07/11] Removed Systime.h includes

---
 assignment-client/src/audio/AudioMixer.cpp | 2 --
 interface/src/Application.cpp              | 4 ----
 interface/src/Audio.h                      | 4 ----
 interface/src/Util.h                       | 6 ------
 interface/src/devices/OculusManager.cpp    | 4 ----
 interface/src/devices/TV3DManager.cpp      | 5 -----
 interface/src/starfield/Controller.cpp     | 4 ----
 interface/src/starfield/Generator.cpp      | 4 ----
 interface/src/ui/BandwidthMeter.h          | 4 ----
 libraries/networking/src/Assignment.h      | 6 ------
 libraries/shared/src/PerfStat.h            | 6 ------
 libraries/shared/src/SharedUtil.h          | 6 ------
 12 files changed, 55 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 65d09f1b00..5fd9efedd7 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -21,12 +21,10 @@
 #include <string.h>
 
 #ifdef _WIN32
-#include "Systime.h"
 #include <math.h>
 #else
 #include <arpa/inet.h>
 #include <netinet/in.h>
-#include <sys/time.h>
 #include <sys/socket.h>
 #endif //_WIN32
 
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b13013cbe2..1e3d3a2259 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -9,10 +9,6 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifdef WIN32
-#include <Systime.h>
-#endif
-
 #include <sstream>
 
 #include <stdlib.h>
diff --git a/interface/src/Audio.h b/interface/src/Audio.h
index f8315b1aab..7ad1ddd926 100644
--- a/interface/src/Audio.h
+++ b/interface/src/Audio.h
@@ -12,10 +12,6 @@
 #ifndef hifi_Audio_h
 #define hifi_Audio_h
 
-#ifdef _WIN32
-#include <Systime.h>
-#endif
-
 #include <fstream>
 #include <vector>
 
diff --git a/interface/src/Util.h b/interface/src/Util.h
index dee0f864b4..02cfd99f9a 100644
--- a/interface/src/Util.h
+++ b/interface/src/Util.h
@@ -12,12 +12,6 @@
 #ifndef hifi_Util_h
 #define hifi_Util_h
 
-#ifdef _WIN32
-#include "Systime.h"
-#else
-#include <sys/time.h>
-#endif
-
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <QSettings>
diff --git a/interface/src/devices/OculusManager.cpp b/interface/src/devices/OculusManager.cpp
index d3da8fe7c3..854b19236d 100644
--- a/interface/src/devices/OculusManager.cpp
+++ b/interface/src/devices/OculusManager.cpp
@@ -11,10 +11,6 @@
 
 #include "InterfaceConfig.h"
 
-#ifdef WIN32
-#include <Systime.h>
-#endif
-
 #include <QOpenGLFramebufferObject>
 
 #include <glm/glm.hpp>
diff --git a/interface/src/devices/TV3DManager.cpp b/interface/src/devices/TV3DManager.cpp
index fcbef0385c..b5cc28b07f 100644
--- a/interface/src/devices/TV3DManager.cpp
+++ b/interface/src/devices/TV3DManager.cpp
@@ -15,11 +15,6 @@
 
 #include <glm/glm.hpp>
 
-
-#ifdef WIN32
-#include <Systime.h>
-#endif
-
 #include "Application.h"
 
 #include "TV3DManager.h"
diff --git a/interface/src/starfield/Controller.cpp b/interface/src/starfield/Controller.cpp
index 2476c33d45..e68243752c 100755
--- a/interface/src/starfield/Controller.cpp
+++ b/interface/src/starfield/Controller.cpp
@@ -9,10 +9,6 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifdef _WIN32
-#include <Systime.h>
-#endif
-
 #include <QElapsedTimer>
 
 #include "starfield/Controller.h"
diff --git a/interface/src/starfield/Generator.cpp b/interface/src/starfield/Generator.cpp
index 869abc90a5..d9773e4452 100644
--- a/interface/src/starfield/Generator.cpp
+++ b/interface/src/starfield/Generator.cpp
@@ -9,10 +9,6 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifdef _WIN32
-#include <Systime.h>
-#endif
-
 #include <QElapsedTimer>
 
 #include "starfield/Generator.h"
diff --git a/interface/src/ui/BandwidthMeter.h b/interface/src/ui/BandwidthMeter.h
index 6cf7e9ea63..c6a28a21c3 100644
--- a/interface/src/ui/BandwidthMeter.h
+++ b/interface/src/ui/BandwidthMeter.h
@@ -12,10 +12,6 @@
 #ifndef hifi_BandwidthMeter_h
 #define hifi_BandwidthMeter_h
 
-#ifdef _WIN32
-#include <Systime.h>
-#endif
-
 #include <QElapsedTimer>
 
 #include <glm/glm.hpp>
diff --git a/libraries/networking/src/Assignment.h b/libraries/networking/src/Assignment.h
index 041121f760..f0f7e8db1a 100644
--- a/libraries/networking/src/Assignment.h
+++ b/libraries/networking/src/Assignment.h
@@ -12,12 +12,6 @@
 #ifndef hifi_Assignment_h
 #define hifi_Assignment_h
 
-#ifdef _WIN32
-#include "Systime.h"
-#else
-#include <sys/time.h>
-#endif
-
 #include <QtCore/QUuid>
 
 #include "NodeList.h"
diff --git a/libraries/shared/src/PerfStat.h b/libraries/shared/src/PerfStat.h
index 478c9afead..22cf14f207 100644
--- a/libraries/shared/src/PerfStat.h
+++ b/libraries/shared/src/PerfStat.h
@@ -18,12 +18,6 @@
 #include <stdint.h>
 #include "SharedUtil.h"
 
-#ifdef _WIN32
-#include "Systime.h"
-#else
-#include <sys/time.h>
-#endif
-
 #include <cstring>
 #include <string>
 #include <map>
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index 87647a9e73..4a3fe2a129 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -24,12 +24,6 @@
 
 #include <QtCore/QDebug>
 
-#ifdef _WIN32
-#include "Systime.h"
-#else
-#include <sys/time.h>
-#endif
-
 const int BYTES_PER_COLOR = 3;
 const int BYTES_PER_FLAGS = 1;
 typedef unsigned char rgbColor[BYTES_PER_COLOR];

From 3eeb3a539dda788907121e1f32a5e9dc6883e242 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 22 Apr 2014 11:48:43 -0700
Subject: [PATCH 08/11] Fixed lack of resolution in usecTimestampNow()

---
 assignment-client/src/main.cpp      |  1 +
 domain-server/src/main.cpp          |  2 ++
 interface/src/main.cpp              |  1 +
 libraries/shared/src/SharedUtil.cpp | 22 +++++++++++++++++++---
 libraries/shared/src/SharedUtil.h   |  1 +
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp
index 24d19ddef6..7132b5c38a 100644
--- a/assignment-client/src/main.cpp
+++ b/assignment-client/src/main.cpp
@@ -17,6 +17,7 @@
 #include "AssignmentClientMonitor.h"
 
 int main(int argc, char* argv[]) {
+    initialiseUsecTimestampNow();
     
 #ifndef WIN32
     setvbuf(stdout, NULL, _IOLBF, 0);
diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp
index bdb10cb56f..871c16a215 100644
--- a/domain-server/src/main.cpp
+++ b/domain-server/src/main.cpp
@@ -18,10 +18,12 @@
 #include <QtCore/QCoreApplication>
 
 #include <Logging.h>
+#include <SharedUtil.h>
 
 #include "DomainServer.h"
 
 int main(int argc, char* argv[]) {
+    initialiseUsecTimestampNow();
     
 #ifndef WIN32
     setvbuf(stdout, NULL, _IOLBF, 0);
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 2bb0633f24..6f9dc5e3bd 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -16,6 +16,7 @@
 #include <SharedUtil.h>
 
 int main(int argc, const char * argv[]) {
+    initialiseUsecTimestampNow();
     QElapsedTimer startupTime;
     startupTime.start();
     
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index a13772d862..78ef997c35 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -21,18 +21,34 @@
 
 #include <QtCore/QDebug>
 #include <QDateTime>
+#include <QElapsedTimer>
 
 #include "OctalCode.h"
 #include "SharedUtil.h"
 
-int usecTimestampNowAdjust = 0;
+
+static qint64 TIME_REFERENCE = 0; // in usec
+static QElapsedTimer timestampTimer;
+static int usecTimestampNowAdjust = 0; // in usec
+
+void initialiseUsecTimestampNow() {
+    static bool initialised = false;
+    if (initialised) {
+        qDebug() << "[WARNING] Double initialisation of usecTimestampNow().";
+        return;
+    }
+    
+    TIME_REFERENCE = QDateTime::currentMSecsSinceEpoch() * 1000; // ms to usec
+    initialised = true;
+}
+
 void usecTimestampNowForceClockSkew(int clockSkew) {
     ::usecTimestampNowAdjust = clockSkew;
 }
 
 quint64 usecTimestampNow() {
-    qint64 msecSinceEpoch = QDateTime::currentMSecsSinceEpoch();
-    return msecSinceEpoch * 1000 + ::usecTimestampNowAdjust;
+    //          usec                       nsec to usec                   usec
+    return TIME_REFERENCE + timestampTimer.nsecsElapsed() / 1000 + ::usecTimestampNowAdjust;
 }
 
 float randFloat() {
diff --git a/libraries/shared/src/SharedUtil.h b/libraries/shared/src/SharedUtil.h
index 4a3fe2a129..54d599070d 100644
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@@ -60,6 +60,7 @@ static const quint64 USECS_PER_SECOND = USECS_PER_MSEC * MSECS_PER_SECOND;
 
 const int BITS_IN_BYTE  = 8;
 
+void initialiseUsecTimestampNow();
 quint64 usecTimestampNow();
 void usecTimestampNowForceClockSkew(int clockSkew);
 

From fea0a262a67f6316de8e32f418e413eaa0a54675 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 22 Apr 2014 12:35:50 -0700
Subject: [PATCH 09/11] Put back missing windows header

---
 libraries/shared/src/SharedUtil.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 78ef997c35..b865d9c717 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -15,6 +15,10 @@
 #include <cctype>
 #include <time.h>
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
 #endif

From ceb5208102f6d5ea8c2a5a5909c966b2c8ac5a77 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 23 Apr 2014 11:00:44 -0700
Subject: [PATCH 10/11] CR

---
 interface/src/Application.cpp          |  5 ++---
 interface/src/Util.cpp                 | 25 +++++++++++++------------
 interface/src/starfield/Controller.cpp |  3 ++-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index bfbc88a666..265ff2e7a1 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1218,8 +1218,7 @@ void Application::touchEndEvent(QTouchEvent* event) {
     if (_controllerScriptingInterface.isTouchCaptured()) {
         return;
     }
-
-    // put any application specific touch behavior below here..
+s    // put any application specific touch behavior below here..
     _touchDragStartedAvgX = _touchAvgX;
     _touchDragStartedAvgY = _touchAvgY;
     _isTouchPressed = false;
@@ -1276,7 +1275,7 @@ void Application::timer() {
         sendPingPackets();
     }
     
-    float diffTime = (float)_timerStart.nsecsElapsed() / 1000000000.0;
+    float diffTime = (float)_timerStart.nsecsElapsed() / 1000000000.0f;
 
     _fps = (float)_frameCount / diffTime;
 
diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp
index 16dd35f316..79a2e31d80 100644
--- a/interface/src/Util.cpp
+++ b/interface/src/Util.cpp
@@ -407,24 +407,25 @@ void runTimingTests() {
     startTime.start();
     float elapsedUsecs;
     
-    elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0;
-    qDebug("QElapsedTimer::nsecElapsed() usecs: %f", 1000.0f * elapsedUsecs / (float) numTests);
+    float NSEC_TO_USEC = 1.0f / 1000.0f;
+    elapsedUsecs = (float)startTime.nsecsElapsed() * NSEC_TO_USEC;
+    qDebug("QElapsedTimer::nsecElapsed() usecs: %f", elapsedUsecs / (float) numTests);
     
     // Random number generation
     startTime.start();
     for (int i = 1; i < numTests; i++) {
         iResults[i] = rand();
     }
-    elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0;
-    qDebug("rand() stored in array usecs: %f, first result:%d", 1000.0f * elapsedUsecs / (float) numTests, iResults[0]);
+    elapsedUsecs = (float)startTime.nsecsElapsed() * NSEC_TO_USEC;
+    qDebug("rand() stored in array usecs: %f, first result:%d", elapsedUsecs / (float) numTests, iResults[0]);
 
     // Random number generation using randFloat()
     startTime.start();
     for (int i = 1; i < numTests; i++) {
         fResults[i] = randFloat();
     }
-    elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0;
-    qDebug("randFloat() stored in array usecs: %f, first result: %f", 1000.0f * elapsedUsecs / (float) numTests, fResults[0]);
+    elapsedUsecs = (float)startTime.nsecsElapsed() * NSEC_TO_USEC;
+    qDebug("randFloat() stored in array usecs: %f, first result: %f", elapsedUsecs / (float) numTests, fResults[0]);
 
     //  PowF function
     fTest = 1145323.2342f;
@@ -432,8 +433,8 @@ void runTimingTests() {
     for (int i = 1; i < numTests; i++) {
         fTest = powf(fTest, 0.5f);
     }
-    elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0;
-    qDebug("powf(f, 0.5) usecs: %f", 1000.0f * elapsedUsecs / (float) numTests);
+    elapsedUsecs = (float)startTime.nsecsElapsed() * NSEC_TO_USEC;
+    qDebug("powf(f, 0.5) usecs: %f", elapsedUsecs / (float) numTests);
 
     //  Vector Math
     float distance;
@@ -444,9 +445,9 @@ void runTimingTests() {
         //float distanceSquared = glm::dot(temp, temp);
         distance = glm::distance(pointA, pointB);
     }
-    elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0;
+    elapsedUsecs = (float)startTime.nsecsElapsed() * NSEC_TO_USEC;
     qDebug("vector math usecs: %f [%f usecs total for %d tests], last result:%f",
-             1000.0f * elapsedUsecs / (float) numTests, elapsedUsecs, numTests, distance);
+           elapsedUsecs / (float) numTests, elapsedUsecs, numTests, distance);
 
     //  Vec3 test
     glm::vec3 vecA(randVector()), vecB(randVector());
@@ -457,8 +458,8 @@ void runTimingTests() {
         glm::vec3 temp = vecA-vecB;
         result = glm::dot(temp,temp);
     }
-    elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0;
-    qDebug("vec3 assign and dot() usecs: %f, last result:%f", 1000.0f * elapsedUsecs / (float) numTests, result);
+    elapsedUsecs = (float)startTime.nsecsElapsed() * NSEC_TO_USEC;
+    qDebug("vec3 assign and dot() usecs: %f, last result:%f", elapsedUsecs / (float) numTests, result);
 }
 
 float loadSetting(QSettings* settings, const char* name, float defaultValue) {
diff --git a/interface/src/starfield/Controller.cpp b/interface/src/starfield/Controller.cpp
index e68243752c..2279a68422 100755
--- a/interface/src/starfield/Controller.cpp
+++ b/interface/src/starfield/Controller.cpp
@@ -23,7 +23,8 @@ bool Controller::computeStars(unsigned numStars, unsigned seed) {
     
     this->retile(numStars, _tileResolution);
     
-    double timeDiff = (double)startTime.nsecsElapsed() / 1000000.0; // ns to ms
+    double NSEC_TO_MSEC = 1.0 / 1000000.0;
+    double timeDiff = (double)startTime.nsecsElapsed() * NSEC_TO_MSEC;
     qDebug() << "Total time to retile and generate stars: " << timeDiff << "msec";
     
     return true;

From f68d2d16a83449fb6a61c6cb19bf3453ffb8bdc3 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 23 Apr 2014 11:05:16 -0700
Subject: [PATCH 11/11] Inserted a char by mistake

---
 interface/src/Application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 265ff2e7a1..4adb2f772a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1218,7 +1218,7 @@ void Application::touchEndEvent(QTouchEvent* event) {
     if (_controllerScriptingInterface.isTouchCaptured()) {
         return;
     }
-s    // put any application specific touch behavior below here..
+    // put any application specific touch behavior below here..
     _touchDragStartedAvgX = _touchAvgX;
     _touchDragStartedAvgY = _touchAvgY;
     _isTouchPressed = false;