tony2001 Wed, 02 Dec 2009 20:34:20 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=291604
Log: CS and folding ++ Changed paths: U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_arrays.h U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_atomic.h U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_sockets.h U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_str.h Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_arrays.h =================================================================== --- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_arrays.h 2009-12-02 20:26:42 UTC (rev 291603) +++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_arrays.h 2009-12-02 20:34:20 UTC (rev 291604) @@ -15,7 +15,7 @@ size_t allocated; }; -static inline struct fpm_array_s *fpm_array_init(struct fpm_array_s *a, unsigned int sz, unsigned int initial_num) +static inline struct fpm_array_s *fpm_array_init(struct fpm_array_s *a, unsigned int sz, unsigned int initial_num) /* {{{ */ { void *allocated = 0; @@ -43,8 +43,9 @@ return a; } +/* }}} */ -static inline void *fpm_array_item(struct fpm_array_s *a, unsigned int n) +static inline void *fpm_array_item(struct fpm_array_s *a, unsigned int n) /* {{{ */ { char *ret; @@ -52,13 +53,15 @@ return ret; } +/* }}} */ -static inline void *fpm_array_item_last(struct fpm_array_s *a) +static inline void *fpm_array_item_last(struct fpm_array_s *a) /* {{{ */ { return fpm_array_item(a, a->used - 1); } +/* }}} */ -static inline int fpm_array_item_remove(struct fpm_array_s *a, unsigned int n) +static inline int fpm_array_item_remove(struct fpm_array_s *a, unsigned int n) /* {{{ */ { int ret = -1; @@ -75,8 +78,9 @@ return ret; } +/* }}} */ -static inline void *fpm_array_push(struct fpm_array_s *a) +static inline void *fpm_array_push(struct fpm_array_s *a) /* {{{ */ { void *ret; @@ -98,13 +102,15 @@ return ret; } +/* }}} */ -static inline void fpm_array_free(struct fpm_array_s *a) +static inline void fpm_array_free(struct fpm_array_s *a) /* {{{ */ { free(a->data); a->data = 0; a->sz = 0; a->used = a->allocated = 0; } +/* }}} */ #endif Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_atomic.h =================================================================== --- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_atomic.h 2009-12-02 20:26:42 UTC (rev 291603) +++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_atomic.h 2009-12-02 20:34:20 UTC (rev 291604) @@ -19,15 +19,16 @@ typedef volatile atomic_uint_t atomic_t; -static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add) +static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add) /* {{{ */ { __asm__ volatile ( "lock;" "xaddl %0, %1;" : "+r" (add) : "m" (*value) : "memory"); return add; } +/* }}} */ -static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) +static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */ { unsigned char res; @@ -36,6 +37,7 @@ return res; } +/* }}} */ #elif ( __amd64__ || __amd64 || __x86_64__ ) @@ -43,15 +45,16 @@ typedef uint64_t atomic_uint_t; typedef volatile atomic_uint_t atomic_t; -static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add) +static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add) /* {{{ */ { __asm__ volatile ( "lock;" "xaddq %0, %1;" : "+r" (add) : "m" (*value) : "memory"); return add; } +/* }}} */ -static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) +static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */ { unsigned char res; @@ -60,6 +63,7 @@ return res; } +/* }}} */ #if (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)) @@ -83,32 +87,36 @@ typedef uint64_t atomic_uint_t; typedef volatile atomic_uint_t atomic_t; -static inline int atomic_cas_64(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) +static inline int atomic_cas_64(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */ { __asm__ __volatile__("casx [%2], %3, %0 " : "=&r"(new) : "0"(new), "r"(lock), "r"(old): "memory"); return new; } +/* }}} */ -static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) +static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */ { return (atomic_cas_64(lock, old, set)==old); } +/* }}} */ #else typedef uint32_t atomic_uint_t; typedef volatile atomic_uint_t atomic_t; -static inline int atomic_cas_32(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) +static inline int atomic_cas_32(atomic_t *lock, atomic_uint_t old, atomic_uint_t new) /* {{{ */ { __asm__ __volatile__("cas [%2], %3, %0 " : "=&r"(new) : "0"(new), "r"(lock), "r"(old): "memory"); return new; } +/* }}} */ -static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) +static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set) /* {{{ */ { return (atomic_cas_32(lock, old, set)==old); } +/* }}} */ #endif #else @@ -117,7 +125,7 @@ #endif -static inline int fpm_spinlock(atomic_t *lock, int try_once) +static inline int fpm_spinlock(atomic_t *lock, int try_once) /* {{{ */ { if (try_once) { return atomic_cmp_set(lock, 0, 1) ? 0 : -1; @@ -134,6 +142,7 @@ return 0; } +/* }}} */ #endif Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_sockets.h =================================================================== --- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_sockets.h 2009-12-02 20:26:42 UTC (rev 291603) +++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_sockets.h 2009-12-02 20:34:20 UTC (rev 291604) @@ -14,19 +14,22 @@ int fpm_sockets_init_main(); -static inline int fd_set_blocked(int fd, int blocked) +static inline int fd_set_blocked(int fd, int blocked) /* {{{ */ { int flags = fcntl(fd, F_GETFL); - if (flags < 0) return -1; + if (flags < 0) { + return -1; + } - if (blocked) + if (blocked) { flags &= ~O_NONBLOCK; - else + } else { flags |= O_NONBLOCK; - + } return fcntl(fd, F_SETFL, flags); } +/* }}} */ #define IPQUAD(sin_addr) \ (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[0], \ Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_str.h =================================================================== --- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_str.h 2009-12-02 20:26:42 UTC (rev 291603) +++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_str.h 2009-12-02 20:34:20 UTC (rev 291604) @@ -5,11 +5,13 @@ #ifndef FPM_STR_H #define FPM_STR_H 1 -static inline char *cpystrn(char *dst, const char *src, size_t dst_size) +static inline char *cpystrn(char *dst, const char *src, size_t dst_size) /* {{{ */ { char *d, *end; - if (!dst_size) return dst; + if (!dst_size) { + return dst; + } d = dst; end = dst + dst_size - 1; @@ -24,8 +26,9 @@ return d; } +/* }}} */ -static inline char *str_purify_filename(char *dst, char *src, size_t size) +static inline char *str_purify_filename(char *dst, char *src, size_t size) /* {{{ */ { char *d, *end; @@ -35,8 +38,7 @@ for (; d < end && *src; ++d, ++src) { if (* (unsigned char *) src < ' ' || * (unsigned char *) src > '\x7f') { *d = '.'; - } - else { + } else { *d = *src; } } @@ -45,5 +47,6 @@ return d; } +/* }}} */ #endif
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php