From 9872573227c373be34c096849a232b04dc009e17 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Fri, 24 Nov 2006 09:02:19 +0000 Subject: [PATCH] Fixed footprint calculation script git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@825 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip-apps/build/Footprint.mak | 2 +- pjsip-apps/build/get-footprint.py | 7 +++++-- pjsip-apps/src/samples/footprint.c | 26 +++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/pjsip-apps/build/Footprint.mak b/pjsip-apps/build/Footprint.mak index 26055cf06..9510d54bb 100644 --- a/pjsip-apps/build/Footprint.mak +++ b/pjsip-apps/build/Footprint.mak @@ -29,8 +29,8 @@ export LIBS := $(subst /,$(HOST_PSEP),$(PJSUA_LIB_LIB)) \ $(subst /,$(HOST_PSEP),$(PJSIP_UA_LIB)) \ $(subst /,$(HOST_PSEP),$(PJSIP_SIMPLE_LIB)) \ $(subst /,$(HOST_PSEP),$(PJSIP_LIB)) \ - $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \ $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ + $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \ $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \ $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) diff --git a/pjsip-apps/build/get-footprint.py b/pjsip-apps/build/get-footprint.py index bef4aa383..de25662ed 100644 --- a/pjsip-apps/build/get-footprint.py +++ b/pjsip-apps/build/get-footprint.py @@ -42,11 +42,13 @@ compile_flags = [ ['HAS_PJLIB_GETOPT', 'PJLIB-UTIL getopt() functionality'], ['HAS_PJLIB_SCANNER', 'PJLIB-UTIL text scanner (needed by SIP parser)'], ['HAS_PJLIB_XML', 'PJLIB-UTIL tiny XML (parsing and API) (needs text scanner)'], + ['HAS_PJLIB_DNS', 'PJLIB-UTIL DNS packet and parsing'], + ['HAS_PJLIB_RESOLVER', 'PJLIB-UTIL Asynchronous DNS resolver/caching engine'], # PJSIP ['HAS_PJSIP_CORE_MSG_ELEM', 'PJSIP Core - Messaging Elements and Parsing (message, headers, SIP URI, TEL URI/RFC 3966, etc.)'], ['HAS_PJSIP_CORE', 'PJSIP Core - Endpoint (transport management, module management, event distribution, etc.)'], - ['HAS_PJSIP_CORE_MSG_UTIL', 'PJSIP Core - Stateless operations, server resolution and fail-over'], + ['HAS_PJSIP_CORE_MSG_UTIL', 'PJSIP Core - Stateless operations, SIP SRV, server resolution and fail-over'], ['HAS_PJSIP_UDP_TRANSPORT', 'PJSIP UDP transport'], ['', 'Subtotal: A minimalistic SIP application (parsing, UDP transport+STUN, no transaction)'], @@ -99,6 +101,7 @@ compile_flags = [ # Codecs ['HAS_PJMEDIA_GSM_CODEC', 'PJMEDIA GSM codec (including PLC)'], ['HAS_PJMEDIA_SPEEX_CODEC', 'PJMEDIA Speex codec (narrowband, wideband, ultra-wideband)'], + ['HAS_PJMEDIA_ILBC_CODEC', 'PJMEDIA iLBC codec'], # Total ['', 'TOTAL: complete libraries (+all codecs)'], @@ -217,7 +220,7 @@ def print_html_report(): # config_site.h output.write('\n

<pj/config.site.h>

\n') output.write('\n') - f = os.popen('cpp -dM ../../pjlib/include/pj/config_site.h | grep PJ') + f = os.popen('cpp -dM -I../../pjlib/include ../../pjlib/include/pj/config_site.h | grep PJ') s = f.readlines() for l in s: output.write(l + '
\n') diff --git a/pjsip-apps/src/samples/footprint.c b/pjsip-apps/src/samples/footprint.c index 7f631a790..b04f2bb54 100644 --- a/pjsip-apps/src/samples/footprint.c +++ b/pjsip-apps/src/samples/footprint.c @@ -42,6 +42,8 @@ #define HAS_PJLIB_GETOPT #define HAS_PJLIB_XML #define HAS_PJLIB_SCANNER +#define HAS_PJLIB_DNS +#define HAS_PJLIB_RESOLVER #define HAS_PJSIP_CORE_MSG_ELEM #define HAS_PJSIP_CORE @@ -82,6 +84,7 @@ #define HAS_PJMEDIA_G711_CODEC #define HAS_PJMEDIA_GSM_CODEC #define HAS_PJMEDIA_SPEEX_CODEC +#define HAS_PJMEDIA_ILBC_CODEC #endif @@ -153,6 +156,22 @@ int dummy_function() pj_scan_restore_state(NULL, NULL); #endif +#ifdef HAS_PJLIB_DNS + pj_dns_make_query(NULL, NULL, 0, 0, NULL); + pj_dns_parse_packet(NULL, NULL, 0, NULL); + pj_dns_packet_dup(NULL, NULL, NULL); +#endif + +#ifdef HAS_PJLIB_RESOLVER + pj_dns_resolver_create(NULL, NULL, 0, NULL, NULL, NULL); + pj_dns_resolver_set_ns(NULL, 0, NULL, NULL); + pj_dns_resolver_handle_events(NULL, NULL); + pj_dns_resolver_destroy(NULL, 0); + pj_dns_resolver_start_query(NULL, NULL, 0, 0, NULL, NULL, NULL); + pj_dns_resolver_cancel_query(NULL, 0); + pj_dns_resolver_add_entry(NULL, NULL, 0); +#endif + #ifdef HAS_PJSIP_CORE_MSG_ELEM /* Parameter container */ pjsip_param_find(NULL, NULL); @@ -351,7 +370,7 @@ int dummy_function() #ifdef HAS_PJSIP_PRESENCE pjsip_pres_init_module(NULL, NULL); pjsip_pres_instance(); - pjsip_pres_create_uac(NULL, NULL, NULL); + pjsip_pres_create_uac(NULL, NULL, 0, NULL); pjsip_pres_create_uas(NULL, NULL, NULL, NULL); pjsip_pres_terminate(NULL, PJ_FALSE); pjsip_pres_initiate(NULL, 100, NULL); @@ -525,6 +544,11 @@ int dummy_function() pjmedia_codec_speex_deinit(); #endif +#ifdef HAS_PJMEDIA_ILBC_CODEC + pjmedia_codec_ilbc_init(NULL, 0); + pjmedia_codec_ilbc_deinit(); +#endif + return 0; }