diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-28 11:36:37 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-28 11:36:37 +0000 |
| commit | d87cc976e1156b839fc6d4aa6b473a126802b8e3 (patch) | |
| tree | 8acb068dd7458e1c8df3a7d8ecb87d065990fdb1 /ext/standard/rand.c | |
| parent | b4f3b9d3ce9f55cf040fb5aa8f201c64646cab43 (diff) | |
| download | php-git-d87cc976e1156b839fc6d4aa6b473a126802b8e3.tar.gz | |
Redesigned thread safety mechanism - nua nua
Diffstat (limited to 'ext/standard/rand.c')
| -rw-r--r-- | ext/standard/rand.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ext/standard/rand.c b/ext/standard/rand.c index 72227af0fd..c863419fa1 100644 --- a/ext/standard/rand.c +++ b/ext/standard/rand.c @@ -96,7 +96,7 @@ /* {{{ seedMT */ -static void seedMT(php_uint32 seed BLS_DC) +static void seedMT(php_uint32 seed TSRMLS_DC) { /* We initialize state[0..(N-1)] via the generator @@ -152,13 +152,13 @@ static void seedMT(php_uint32 seed BLS_DC) } /* }}} */ -static php_uint32 reloadMT(BLS_D) +static php_uint32 reloadMT(TSRMLS_D) { register php_uint32 *p0=BG(state), *p2=BG(state)+2, *pM=BG(state)+M, s0, s1; register int j; if(BG(left) < -1) - seedMT(4357U BLS_CC); + seedMT(4357U TSRMLS_CC); BG(left)=N-1, BG(next)=BG(state)+1; @@ -179,10 +179,10 @@ static php_uint32 reloadMT(BLS_D) static inline php_uint32 randomMT(void) { php_uint32 y; - BLS_FETCH(); + TSRMLS_FETCH(); if(--BG(left) < 0) - return(reloadMT(BLS_C)); + return(reloadMT(TSRMLS_C)); y = *BG(next)++; y ^= (y >> 11); @@ -210,13 +210,12 @@ PHP_FUNCTION(srand) PHP_FUNCTION(mt_srand) { pval **arg; - BLS_FETCH(); if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } convert_to_long_ex(arg); - seedMT((*arg)->value.lval BLS_CC); + seedMT((*arg)->value.lval TSRMLS_CC); } /* }}} */ |