yuzu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2025-08-03 21:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove static initializer in linux/guid_creator.cc.

Browse source 
There was a static initializer generated for this file in Chrome for Android.

 Patch by pliard@chromium.org
 Original review: http://breakpad.appspot.com/359001/
Review URL: https://breakpad.appspot.com/359002

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@931 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
qsr@chromium.org 2012-03-08 18:47:26 +00:00
parent 76acc0edcd
commit fe7f63632f
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/common/linux/guid_creator.cc
View file

@ -30,6 +30,7 @@
#include "common/linux/guid_creator.h" #include "common/linux/guid_creator.h"
#include <assert.h> #include <assert.h>
#include <pthread.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
@ -45,10 +46,6 @@
// //
class GUIDGenerator { class GUIDGenerator {
public: public:
GUIDGenerator() {
srandom(time(NULL));
}
static u_int32_t BytesToUInt32(const u_int8_t bytes[]) { static u_int32_t BytesToUInt32(const u_int8_t bytes[]) {
return ((u_int32_t) bytes[0] return ((u_int32_t) bytes[0]
| ((u_int32_t) bytes[1] << 8) | ((u_int32_t) bytes[1] << 8)
@ -63,7 +60,8 @@ class GUIDGenerator {
bytes[3] = (n >> 24) & 0xff; bytes[3] = (n >> 24) & 0xff;
} }
bool CreateGUID(GUID *guid) const { static bool CreateGUID(GUID *guid) {
InitOnce();
guid->data1 = random(); guid->data1 = random();
guid->data2 = (u_int16_t)(random()); guid->data2 = (u_int16_t)(random());
guid->data3 = (u_int16_t)(random()); guid->data3 = (u_int16_t)(random());
@ -71,13 +69,23 @@ class GUIDGenerator {
UInt32ToBytes(&guid->data4[4], random()); UInt32ToBytes(&guid->data4[4], random());
return true; return true;
} }
private:
static void InitOnce() {
pthread_once(&once_control, &InitOnceImpl);
}
static void InitOnceImpl() {
srandom(time(NULL));
}
static pthread_once_t once_control;
}; };
// Guid generator. pthread_once_t GUIDGenerator::once_control = PTHREAD_ONCE_INIT;
const GUIDGenerator kGuidGenerator;
bool CreateGUID(GUID *guid) { bool CreateGUID(GUID *guid) {
return kGuidGenerator.CreateGUID(guid); return GUIDGenerator::CreateGUID(guid);
} }
// Parse guid to string. // Parse guid to string.