projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo in ust consumer log message (channek -> channel)
[lttng-tools.git]
/
src
/
common
/
hashtable
/
hashtable.c
diff --git
a/src/common/hashtable/hashtable.c
b/src/common/hashtable/hashtable.c
index 55346b903bb5a465e23d07d4037f174ea00e9ce1..4fb19cffda923bf1f19062be891f6180f0e48c14 100644
(file)
--- a/
src/common/hashtable/hashtable.c
+++ b/
src/common/hashtable/hashtable.c
@@
-15,7
+15,6
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <assert.h>
#include <string.h>
#define _LGPL_SOURCE
#include <assert.h>
#include <string.h>
@@
-28,6
+27,9
@@
#include "hashtable.h"
#include "utils.h"
#include "hashtable.h"
#include "utils.h"
+/* seed_lock protects both seed_init and lttng_ht_seed. */
+static pthread_mutex_t seed_lock = PTHREAD_MUTEX_INITIALIZER;
+static bool seed_init;
unsigned long lttng_ht_seed;
static unsigned long min_hash_alloc_size = 1;
unsigned long lttng_ht_seed;
static unsigned long min_hash_alloc_size = 1;
@@
-96,6
+98,13
@@
struct lttng_ht *lttng_ht_new(unsigned long size, int type)
if (!size)
size = DEFAULT_HT_SIZE;
if (!size)
size = DEFAULT_HT_SIZE;
+ pthread_mutex_lock(&seed_lock);
+ if (!seed_init) {
+ lttng_ht_seed = (unsigned long) time(NULL);
+ seed_init = true;
+ }
+ pthread_mutex_unlock(&seed_lock);
+
ht = zmalloc(sizeof(*ht));
if (ht == NULL) {
PERROR("zmalloc lttng_ht");
ht = zmalloc(sizeof(*ht));
if (ht == NULL) {
PERROR("zmalloc lttng_ht");
@@
-579,12
+588,3
@@
struct lttng_ht_node_two_u64 *lttng_ht_iter_get_node_two_u64(
}
return caa_container_of(node, struct lttng_ht_node_two_u64, node);
}
}
return caa_container_of(node, struct lttng_ht_node_two_u64, node);
}
-
-/*
- * lib constructor
- */
-static void __attribute__((constructor)) _init(void)
-{
- /* Init hash table seed */
- lttng_ht_seed = (unsigned long) time(NULL);
-}
This page took
0.024806 seconds
and
4
git commands to generate.