56513f5ff4
Because of the way the SDK and Android system images are branched,
host code that goes into the SDK tools can't live in the same
repository as code that goes into the system image. This change keeps
the emugl host code in sdk.git/emulator/opengl while moving the emugl
system code to development.git/tools/emulator/opengl.
A few changes were made beyond simply cloning the directories:
(a) Makefiles were modified to only build the relevant components. Not
doing so would break the build due to having multiple rule
definitions.
(b) Protocol spec files were moved from the guest encoder directories
to the host decoder directories. The decoder must support older
versions of the protocol, but not newer versions, so it makes
sense to keep the latest version of the protocol spec with the
decoder.
(c) Along with that, the encoder is now built from checked in
generated encoder source rather than directly from the protocol
spec. The generated code must be updated manually. This makes it
possible to freeze the system encoder version without freezing the
host decoder version, and also makes it very obvious when a
protocol changes is happening that will require special
backwards-compatibility support in the decoder/renderer.
(d) Host-only and system-only code were removed from the repository
where they aren't used.
(e) README and DESIGN documents were updated to reflect this split.
No actual source code was changed due to the above.
Change-Id: I2c936101ea0405b372750d36ba0f01e84d719c43
70 lines
1.6 KiB
C++
70 lines
1.6 KiB
C++
/*
|
|
* Copyright (C) 2011 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
#include "TimeUtils.h"
|
|
|
|
#ifdef _WIN32
|
|
#include <windows.h>
|
|
#include <time.h>
|
|
#include <stdio.h>
|
|
#elif defined(__linux__)
|
|
#include <stdlib.h>
|
|
#include <sys/time.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
#else
|
|
#include <sys/time.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
long long GetCurrentTimeMS()
|
|
{
|
|
#ifdef _WIN32
|
|
static LARGE_INTEGER freq;
|
|
static bool bNotInit = true;
|
|
if ( bNotInit ) {
|
|
bNotInit = (QueryPerformanceFrequency( &freq ) == FALSE);
|
|
}
|
|
LARGE_INTEGER currVal;
|
|
QueryPerformanceCounter( &currVal );
|
|
|
|
return currVal.QuadPart / (freq.QuadPart / 1000);
|
|
|
|
#elif defined(__linux__)
|
|
|
|
struct timespec now;
|
|
clock_gettime(CLOCK_MONOTONIC, &now);
|
|
long long iDiff = (now.tv_sec * 1000LL) + now.tv_nsec/1000000LL;
|
|
return iDiff;
|
|
|
|
#else /* Others, e.g. OS X */
|
|
|
|
struct timeval now;
|
|
gettimeofday(&now, NULL);
|
|
long long iDiff = (now.tv_sec * 1000LL) + now.tv_usec/1000LL;
|
|
return iDiff;
|
|
|
|
#endif
|
|
}
|
|
|
|
void TimeSleepMS(int p_mili)
|
|
{
|
|
#ifdef _WIN32
|
|
Sleep(p_mili);
|
|
#else
|
|
usleep(p_mili * 1000);
|
|
#endif
|
|
}
|