diff options
author | Benny Prijono <bennylp@teluu.com> | 2005-11-21 17:06:21 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2005-11-21 17:06:21 +0000 |
commit | c8974baa51aad3cb810611027e4f03ebf509f740 (patch) | |
tree | 0666e56081169be7dfa54bc414454ffc2d4e33eb /pjlib-util/include | |
parent | 5721450040bd1b09af00123679577ff190da006b (diff) |
Scanner optimization and added cis_uint backend
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@73 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib-util/include')
-rw-r--r-- | pjlib-util/include/pjlib-util/scanner.h | 78 | ||||
-rw-r--r-- | pjlib-util/include/pjlib-util/scanner_cis_bitwise.h | 96 | ||||
-rw-r--r-- | pjlib-util/include/pjlib-util/scanner_cis_uint.h | 83 |
3 files changed, 193 insertions, 64 deletions
diff --git a/pjlib-util/include/pjlib-util/scanner.h b/pjlib-util/include/pjlib-util/scanner.h index d7db4a92..1a4a69ef 100644 --- a/pjlib-util/include/pjlib-util/scanner.h +++ b/pjlib-util/include/pjlib-util/scanner.h @@ -26,6 +26,16 @@ #include <pj/types.h> +/** + * Macro PJ_SCANNER_USE_BITWISE is defined and non-zero (by default yes) + * will enable the use of bitwise for character input specification (cis). + * This would save several kilobytes of .bss memory in the SIP parser. + */ +#ifndef PJ_SCANNER_USE_BITWISE +# define PJ_SCANNER_USE_BITWISE 1 +#endif + + PJ_BEGIN_DECL /** @@ -36,46 +46,13 @@ PJ_BEGIN_DECL * * @{ */ - -/** - * This describes the type of individual character specification in - * #pj_cis_buf_t. Basicly the number of bits here - */ -#ifndef PJ_CIS_ELEM_TYPE -# define PJ_CIS_ELEM_TYPE pj_uint32_t +#if defined(PJ_SCANNER_USE_BITWISE) && PJ_SCANNER_USE_BITWISE != 0 +# include <pjlib-util/scanner_cis_bitwise.h> +#else +# include <pjlib-util/scanner_cis_uint.h> #endif /** - * This describes the type of individual character specification in - * #pj_cis_buf_t. - */ -typedef PJ_CIS_ELEM_TYPE pj_cis_elem_t; - -/** - * Maximum number of input specification in a buffer. - * Effectively this means the number of bits in pj_cis_elem_t. - */ -#define PJ_CIS_MAX_INDEX (sizeof(pj_cis_elem_t) << 3) - -/** - * The scanner input specification buffer. - */ -typedef struct pj_cis_buf_t -{ - pj_cis_elem_t cis_buf[256]; /**< Must be 256 (not 128)! */ - pj_cis_elem_t use_mask; /**< To keep used indexes. */ -} pj_cis_buf_t; - -/** - * Character input specification. - */ -typedef struct pj_cis_t -{ - pj_cis_elem_t *cis_buf; /**< Pointer to buffer. */ - int cis_id; /**< Id. */ -} pj_cis_t; - -/** * Initialize scanner input specification buffer. * * @param cs_buf The scanner character specification. @@ -108,33 +85,6 @@ PJ_DECL(pj_status_t) pj_cis_init(pj_cis_buf_t *cs_buf, pj_cis_t *cis); PJ_DECL(pj_status_t) pj_cis_dup(pj_cis_t *new_cis, pj_cis_t *existing); /** - * Set the membership of the specified character. - * Note that this is a macro, and arguments may be evaluated more than once. - * - * @param cis Pointer to character input specification. - * @param c The character. - */ -#define PJ_CIS_SET(cis,c) ((cis)->cis_buf[(c)] |= (1 << (cis)->cis_id)) - -/** - * Remove the membership of the specified character. - * Note that this is a macro, and arguments may be evaluated more than once. - * - * @param cis Pointer to character input specification. - * @param c The character to be removed from the membership. - */ -#define PJ_CIS_CLR(cis,c) ((cis)->cis_buf[c] &= ~(1 << (cis)->cis_id)) - -/** - * Check the membership of the specified character. - * Note that this is a macro, and arguments may be evaluated more than once. - * - * @param cis Pointer to character input specification. - * @param c The character. - */ -#define PJ_CIS_ISSET(cis,c) ((cis)->cis_buf[c] & (1 << (cis)->cis_id)) - -/** * Add the characters in the specified range '[cstart, cend)' to the * specification (the last character itself ('cend') is not added). * diff --git a/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h b/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h new file mode 100644 index 00000000..3f466941 --- /dev/null +++ b/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h @@ -0,0 +1,96 @@ +/* $Id$ */ +/* + * Copyright (C) 2003-2005 Benny Prijono <benny@prijono.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef __PJLIB_UTIL_SCANNER_CIS_BIT_H__ +#define __PJLIB_UTIL_SCANNER_CIS_BIT_H__ + +#include <pj/types.h> + +PJ_BEGIN_DECL + +/** + * This describes the type of individual character specification in + * #pj_cis_buf_t. Basicly the number of bits here + */ +#ifndef PJ_CIS_ELEM_TYPE +# define PJ_CIS_ELEM_TYPE pj_uint32_t +#endif + +/** + * This describes the type of individual character specification in + * #pj_cis_buf_t. + */ +typedef PJ_CIS_ELEM_TYPE pj_cis_elem_t; + +/** + * Maximum number of input specification in a buffer. + * Effectively this means the number of bits in pj_cis_elem_t. + */ +#define PJ_CIS_MAX_INDEX (sizeof(pj_cis_elem_t) << 3) + +/** + * The scanner input specification buffer. + */ +typedef struct pj_cis_buf_t +{ + pj_cis_elem_t cis_buf[256]; /**< Must be 256 (not 128)! */ + pj_cis_elem_t use_mask; /**< To keep used indexes. */ +} pj_cis_buf_t; + +/** + * Character input specification. + */ +typedef struct pj_cis_t +{ + pj_cis_elem_t *cis_buf; /**< Pointer to buffer. */ + int cis_id; /**< Id. */ +} pj_cis_t; + + +/** + * Set the membership of the specified character. + * Note that this is a macro, and arguments may be evaluated more than once. + * + * @param cis Pointer to character input specification. + * @param c The character. + */ +#define PJ_CIS_SET(cis,c) ((cis)->cis_buf[(c)] |= (1 << (cis)->cis_id)) + +/** + * Remove the membership of the specified character. + * Note that this is a macro, and arguments may be evaluated more than once. + * + * @param cis Pointer to character input specification. + * @param c The character to be removed from the membership. + */ +#define PJ_CIS_CLR(cis,c) ((cis)->cis_buf[c] &= ~(1 << (cis)->cis_id)) + +/** + * Check the membership of the specified character. + * Note that this is a macro, and arguments may be evaluated more than once. + * + * @param cis Pointer to character input specification. + * @param c The character. + */ +#define PJ_CIS_ISSET(cis,c) ((cis)->cis_buf[c] & (1 << (cis)->cis_id)) + + + +PJ_END_DECL + +#endif /* __PJLIB_UTIL_SCANNER_CIS_BIT_H__ */ diff --git a/pjlib-util/include/pjlib-util/scanner_cis_uint.h b/pjlib-util/include/pjlib-util/scanner_cis_uint.h new file mode 100644 index 00000000..eb779f6b --- /dev/null +++ b/pjlib-util/include/pjlib-util/scanner_cis_uint.h @@ -0,0 +1,83 @@ +/* $Id$ */ +/* + * Copyright (C) 2003-2005 Benny Prijono <benny@prijono.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef __PJLIB_UTIL_SCANNER_CIS_BIT_H__ +#define __PJLIB_UTIL_SCANNER_CIS_BIT_H__ + +#include <pj/types.h> + +PJ_BEGIN_DECL + +/** + * This describes the type of individual character specification in + * #pj_cis_buf_t. Basicly the number of bits here + */ +#ifndef PJ_CIS_ELEM_TYPE +# define PJ_CIS_ELEM_TYPE int +#endif + +/** + * This describes the type of individual character specification in + * #pj_cis_buf_t. + */ +typedef PJ_CIS_ELEM_TYPE pj_cis_elem_t; + +/** pj_cis_buf_t is not used when uint back-end is used. */ +typedef int pj_cis_buf_t; + +/** + * Character input specification. + */ +typedef struct pj_cis_t +{ + PJ_CIS_ELEM_TYPE cis_buf[256]; +} pj_cis_t; + + +/** + * Set the membership of the specified character. + * Note that this is a macro, and arguments may be evaluated more than once. + * + * @param cis Pointer to character input specification. + * @param c The character. + */ +#define PJ_CIS_SET(cis,c) ((cis)->cis_buf[(c)] = 1) + +/** + * Remove the membership of the specified character. + * Note that this is a macro, and arguments may be evaluated more than once. + * + * @param cis Pointer to character input specification. + * @param c The character to be removed from the membership. + */ +#define PJ_CIS_CLR(cis,c) ((cis)->cis_buf[c] = 0) + +/** + * Check the membership of the specified character. + * Note that this is a macro, and arguments may be evaluated more than once. + * + * @param cis Pointer to character input specification. + * @param c The character. + */ +#define PJ_CIS_ISSET(cis,c) ((cis)->cis_buf[c]) + + + +PJ_END_DECL + +#endif /* __PJLIB_UTIL_SCANNER_CIS_BIT_H__ */ |