aboutsummaryrefslogtreecommitdiffstats
path: root/include/jemalloc/internal
diff options
context:
space:
mode:
authorJason Evans <je@fb.com>2012-03-02 15:59:45 -0800
committerJason Evans <je@fb.com>2012-03-02 15:59:45 -0800
commit84f7cdb0c588322dfd50a26497fc1cb54b792018 (patch)
treedb43a570a7319ddc3ccea9eb24ab163a38e32e54 /include/jemalloc/internal
parent62320b85517c472beb12bf0ba69660393712f51a (diff)
downloadplatform_external_jemalloc_new-84f7cdb0c588322dfd50a26497fc1cb54b792018.tar.gz
platform_external_jemalloc_new-84f7cdb0c588322dfd50a26497fc1cb54b792018.tar.bz2
platform_external_jemalloc_new-84f7cdb0c588322dfd50a26497fc1cb54b792018.zip
Rename prn to prng.
Rename prn to prng so that Windows doesn't choke when trying to create a file named prn.h.
Diffstat (limited to 'include/jemalloc/internal')
-rw-r--r--include/jemalloc/internal/ckh.h2
-rw-r--r--include/jemalloc/internal/jemalloc_internal.h.in8
-rw-r--r--include/jemalloc/internal/prng.h (renamed from include/jemalloc/internal/prn.h)8
-rw-r--r--include/jemalloc/internal/prof.h6
4 files changed, 12 insertions, 12 deletions
diff --git a/include/jemalloc/internal/ckh.h b/include/jemalloc/internal/ckh.h
index 65f30f56..05d1fc03 100644
--- a/include/jemalloc/internal/ckh.h
+++ b/include/jemalloc/internal/ckh.h
@@ -42,7 +42,7 @@ struct ckh_s {
/* Used for pseudo-random number generation. */
#define CKH_A 1103515241
#define CKH_C 12347
- uint32_t prn_state;
+ uint32_t prng_state;
/* Total number of items. */
size_t count;
diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
index f13b406e..403e4804 100644
--- a/include/jemalloc/internal/jemalloc_internal.h.in
+++ b/include/jemalloc/internal/jemalloc_internal.h.in
@@ -316,7 +316,7 @@ extern void (*je_malloc_message)(void *wcbopaque, const char *s);
(((s) + PAGE_MASK) & ~PAGE_MASK)
#include "jemalloc/internal/atomic.h"
-#include "jemalloc/internal/prn.h"
+#include "jemalloc/internal/prng.h"
#include "jemalloc/internal/ckh.h"
#include "jemalloc/internal/size_classes.h"
#include "jemalloc/internal/stats.h"
@@ -342,7 +342,7 @@ extern void (*je_malloc_message)(void *wcbopaque, const char *s);
#define JEMALLOC_H_STRUCTS
#include "jemalloc/internal/atomic.h"
-#include "jemalloc/internal/prn.h"
+#include "jemalloc/internal/prng.h"
#include "jemalloc/internal/ckh.h"
#include "jemalloc/internal/size_classes.h"
#include "jemalloc/internal/stats.h"
@@ -445,7 +445,7 @@ void jemalloc_prefork(void);
void jemalloc_postfork(void);
#include "jemalloc/internal/atomic.h"
-#include "jemalloc/internal/prn.h"
+#include "jemalloc/internal/prng.h"
#include "jemalloc/internal/ckh.h"
#include "jemalloc/internal/size_classes.h"
#include "jemalloc/internal/stats.h"
@@ -471,7 +471,7 @@ void jemalloc_postfork(void);
#define JEMALLOC_H_INLINES
#include "jemalloc/internal/atomic.h"
-#include "jemalloc/internal/prn.h"
+#include "jemalloc/internal/prng.h"
#include "jemalloc/internal/ckh.h"
#include "jemalloc/internal/size_classes.h"
#include "jemalloc/internal/stats.h"
diff --git a/include/jemalloc/internal/prn.h b/include/jemalloc/internal/prng.h
index 0709d708..83a5462b 100644
--- a/include/jemalloc/internal/prn.h
+++ b/include/jemalloc/internal/prng.h
@@ -4,7 +4,7 @@
/*
* Simple linear congruential pseudo-random number generator:
*
- * prn(y) = (a*x + c) % m
+ * prng(y) = (a*x + c) % m
*
* where the following constants ensure maximal period:
*
@@ -25,7 +25,7 @@
* uint32_t state : Seed value.
* const uint32_t a, c : See above discussion.
*/
-#define prn32(r, lg_range, state, a, c) do { \
+#define prng32(r, lg_range, state, a, c) do { \
assert(lg_range > 0); \
assert(lg_range <= 32); \
\
@@ -34,8 +34,8 @@
r >>= (32 - lg_range); \
} while (false)
-/* Same as prn32(), but 64 bits of pseudo-randomness, using uint64_t. */
-#define prn64(r, lg_range, state, a, c) do { \
+/* Same as prng32(), but 64 bits of pseudo-randomness, using uint64_t. */
+#define prng64(r, lg_range, state, a, c) do { \
assert(lg_range > 0); \
assert(lg_range <= 64); \
\
diff --git a/include/jemalloc/internal/prof.h b/include/jemalloc/internal/prof.h
index 744d361e..e08a50ab 100644
--- a/include/jemalloc/internal/prof.h
+++ b/include/jemalloc/internal/prof.h
@@ -140,7 +140,7 @@ struct prof_tdata_s {
void **vec;
/* Sampling state. */
- uint64_t prn_state;
+ uint64_t prng_state;
uint64_t threshold;
uint64_t accum;
};
@@ -245,7 +245,7 @@ bool prof_boot2(void);
if (prof_tdata->threshold == 0) { \
/* Initialize. Seed the prng differently for */\
/* each thread. */\
- prof_tdata->prn_state = \
+ prof_tdata->prng_state = \
(uint64_t)(uintptr_t)&size; \
prof_sample_threshold_update(prof_tdata); \
} \
@@ -307,7 +307,7 @@ prof_sample_threshold_update(prof_tdata_t *prof_tdata)
* pp 500
* (http://cg.scs.carleton.ca/~luc/rnbookindex.html)
*/
- prn64(r, 53, prof_tdata->prn_state,
+ prng64(r, 53, prof_tdata->prng_state,
(uint64_t)6364136223846793005LLU, (uint64_t)1442695040888963407LLU);
u = (double)r * (1.0/9007199254740992.0L);
prof_tdata->threshold = (uint64_t)(log(u) /