[asterisk-commits] mmichelson: branch 1.6.0 r114056 - in /branches/1.6.0: ./ include/asterisk/ m...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Apr 10 17:23:14 CDT 2008
Author: mmichelson
Date: Thu Apr 10 17:23:14 2008
New Revision: 114056
URL: http://svn.digium.com/view/asterisk?view=rev&rev=114056
Log:
Merged revisions 114052 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114052 | mmichelson | 2008-04-10 17:02:32 -0500 (Thu, 10 Apr 2008) | 11 lines
Merged revisions 114051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114051 | mmichelson | 2008-04-10 15:59:49 -0500 (Thu, 10 Apr 2008) | 3 lines
Fix 1.4 build when LOW_MEMORY is enabled.
........
................
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/include/asterisk/lock.h
branches/1.6.0/main/manager.c
branches/1.6.0/main/utils.c
branches/1.6.0/utils/Makefile
branches/1.6.0/utils/ael_main.c
branches/1.6.0/utils/astman.c
branches/1.6.0/utils/check_expr.c
branches/1.6.0/utils/conf2ael.c
branches/1.6.0/utils/hashtest.c
branches/1.6.0/utils/hashtest2.c
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/lock.h?view=diff&rev=114056&r1=114055&r2=114056
==============================================================================
--- branches/1.6.0/include/asterisk/lock.h (original)
+++ branches/1.6.0/include/asterisk/lock.h Thu Apr 10 17:23:14 2008
@@ -148,18 +148,31 @@
* lock info struct. The lock is marked as pending as the thread is waiting
* on the lock. ast_mark_lock_acquired() will mark it as held by this thread.
*/
+#if !defined(LOW_MEMORY)
void ast_store_lock_info(enum ast_lock_type type, const char *filename,
int line_num, const char *func, const char *lock_name, void *lock_addr);
+#else
+#define ast_store_lock_info(I,DONT,CARE,ABOUT,THE,PARAMETERS)
+#endif
+
/*!
* \brief Mark the last lock as acquired
*/
+#if !defined(LOW_MEMORY)
void ast_mark_lock_acquired(void *lock_addr);
+#else
+#define ast_mark_lock_acquired(ignore)
+#endif
/*!
* \brief Mark the last lock as failed (trylock)
*/
+#if !defined(LOW_MEMORY)
void ast_mark_lock_failed(void *lock_addr);
+#else
+#define ast_mark_lock_failed(ignore)
+#endif
/*!
* \brief remove lock info for the current thread
@@ -167,7 +180,11 @@
* this gets called by ast_mutex_unlock so that information on the lock can
* be removed from the current thread's lock info struct.
*/
+#if !defined(LOW_MEMORY)
void ast_remove_lock_info(void *lock_addr);
+#else
+#define ast_remove_lock_info(ignore)
+#endif
static void __attribute__((constructor)) init_empty_mutex(void)
{
Modified: branches/1.6.0/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/manager.c?view=diff&rev=114056&r1=114055&r2=114056
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Thu Apr 10 17:23:14 2008
@@ -2556,7 +2556,9 @@
const char *module = astman_get_header(m, "Module");
const char *id = astman_get_header(m, "ActionID");
char idText[256];
+#if !defined(LOW_MEMORY)
const char *version;
+#endif
char filename[PATH_MAX];
char *cut;
@@ -2575,14 +2577,18 @@
}
snprintf(cut, (sizeof(filename) - strlen(filename)) - 1, ".c");
ast_log(LOG_DEBUG, "**** ModuleCheck .c file %s\n", filename);
+#if !defined(LOW_MEMORY)
version = ast_file_version_find(filename);
+#endif
if (!ast_strlen_zero(id))
snprintf(idText, sizeof(idText), "ActionID: %s\r\n", id);
else
idText[0] = '\0';
astman_append(s, "Response: Success\r\n%s", idText);
+#if !defined(LOW_MEMORY)
astman_append(s, "Version: %s\r\n\r\n", version ? version : "");
+#endif
return 0;
}
Modified: branches/1.6.0/main/utils.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/utils.c?view=diff&rev=114056&r1=114055&r2=114056
==============================================================================
--- branches/1.6.0/main/utils.c (original)
+++ branches/1.6.0/main/utils.c Thu Apr 10 17:23:14 2008
@@ -1568,7 +1568,9 @@
#endif
base64_init();
#ifdef DEBUG_THREADS
+#if !defined(LOW_MEMORY)
ast_cli_register_multiple(utils_cli, sizeof(utils_cli) / sizeof(utils_cli[0]));
#endif
+#endif
return 0;
}
Modified: branches/1.6.0/utils/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/utils/Makefile?view=diff&rev=114056&r1=114055&r2=114056
==============================================================================
--- branches/1.6.0/utils/Makefile (original)
+++ branches/1.6.0/utils/Makefile Thu Apr 10 17:23:14 2008
@@ -80,7 +80,7 @@
md5.c: $(ASTTOPDIR)/main/md5.c
@cp $< $@
-
+astman.o: astman.i
astman: astman.o md5.o
astman: LIBS+=$(NEWT_LIB)
Modified: branches/1.6.0/utils/ael_main.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/utils/ael_main.c?view=diff&rev=114056&r1=114055&r2=114056
==============================================================================
--- branches/1.6.0/utils/ael_main.c (original)
+++ branches/1.6.0/utils/ael_main.c Thu Apr 10 17:23:14 2008
@@ -165,14 +165,17 @@
return 0; /* in "standalone" mode, functions are just not avail */
}
+void ast_register_file_version(const char *file, const char *version);
void ast_register_file_version(const char *file, const char *version)
{
}
+void ast_unregister_file_version(const char *file);
void ast_unregister_file_version(const char *file)
{
}
+#if !defined(LOW_MEMORY)
int ast_add_profile(const char *x, uint64_t scale)
{
if (!no_comp)
@@ -180,6 +183,7 @@
return 0;
}
+#endif
int ast_loader_register(int (*updater)(void))
{
@@ -582,3 +586,4 @@
return 0;
}
+
Modified: branches/1.6.0/utils/astman.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/utils/astman.c?view=diff&rev=114056&r1=114055&r2=114056
==============================================================================
--- branches/1.6.0/utils/astman.c (original)
+++ branches/1.6.0/utils/astman.c Thu Apr 10 17:23:14 2008
@@ -92,6 +92,7 @@
{
}
+#if !defined(LOW_MEMORY)
int ast_add_profile(const char *, uint64_t scale);
int ast_add_profile(const char *s, uint64_t scale)
{
@@ -108,6 +109,7 @@
{
return 0;
}
+#endif /* LOW_MEMORY */
/* end of dummy functions */
Modified: branches/1.6.0/utils/check_expr.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/utils/check_expr.c?view=diff&rev=114056&r1=114055&r2=114056
==============================================================================
--- branches/1.6.0/utils/check_expr.c (original)
+++ branches/1.6.0/utils/check_expr.c Thu Apr 10 17:23:14 2008
@@ -85,6 +85,7 @@
AST_WRLOCK,
};
#endif
+#if !defined(LOW_MEMORY)
void ast_store_lock_info(enum ast_lock_type type, const char *filename,
int line_num, const char *func, const char *lock_name, void *lock_addr);
void ast_store_lock_info(enum ast_lock_type type, const char *filename,
@@ -104,6 +105,7 @@
{
/* not a lot to do in a standalone w/o threading! */
}
+#endif
static int global_lineno = 1;
static int global_expr_count=0;
@@ -145,9 +147,11 @@
int check_eval(char *buffer, char *error_report);
void parse_file(const char *fname);
+void ast_register_file_version(const char *file, const char *version);
void ast_register_file_version(const char *file, const char *version) { }
+#if !defined(LOW_MEMORY)
int ast_add_profile(const char *x, uint64_t scale) { return 0;}
-
+#endif
int ast_atomic_fetchadd_int_slow(volatile int *p, int v)
{
int ret;
@@ -156,6 +160,7 @@
return ret;
}
+void ast_unregister_file_version(const char *file);
void ast_unregister_file_version(const char *file)
{
}
Modified: branches/1.6.0/utils/conf2ael.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/utils/conf2ael.c?view=diff&rev=114056&r1=114055&r2=114056
==============================================================================
--- branches/1.6.0/utils/conf2ael.c (original)
+++ branches/1.6.0/utils/conf2ael.c Thu Apr 10 17:23:14 2008
@@ -76,15 +76,18 @@
/* static AST_RWLIST_HEAD_STATIC(acf_root, ast_custom_function); */
//extern char ast_config_AST_CONFIG_DIR[PATH_MAX];
+void ast_register_file_version(const char *file, const char *version);
void ast_register_file_version(const char *file, const char *version)
{
}
+void ast_unregister_file_version(const char *file);
void ast_unregister_file_version(const char *file)
{
}
+#if !defined(LOW_MEMORY)
int ast_add_profile(const char *x, uint64_t scale) { return 0;}
-
+#endif
/* Our own version of ast_log, since the expr parser uses it. -- stolen from utils/check_expr.c */
void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__ ((format (printf,5,6)));
Modified: branches/1.6.0/utils/hashtest.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/utils/hashtest.c?view=diff&rev=114056&r1=114055&r2=114056
==============================================================================
--- branches/1.6.0/utils/hashtest.c (original)
+++ branches/1.6.0/utils/hashtest.c Thu Apr 10 17:23:14 2008
@@ -43,11 +43,12 @@
int testno = 1;
/* stuff we need to make this work with the hashtab stuff */
-
+#if !defined(LOW_MEMORY)
int64_t ast_mark(int prof_id, int x)
{
return 0;
}
+#endif
struct ht_element
{
@@ -299,11 +300,12 @@
return 0;
}
-
+#if !defined(LOW_MEMORY)
int ast_add_profile(const char *x, uint64_t scale)
{
return 0;
}
+#endif
int ast_loader_register(int (*updater)(void))
{
@@ -323,10 +325,12 @@
}
+void ast_register_file_version(const char *file, const char *version);
void ast_register_file_version(const char *file, const char *version)
{
}
+void ast_unregister_file_version(const char *file);
void ast_unregister_file_version(const char *file)
{
Modified: branches/1.6.0/utils/hashtest2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/utils/hashtest2.c?view=diff&rev=114056&r1=114055&r2=114056
==============================================================================
--- branches/1.6.0/utils/hashtest2.c (original)
+++ branches/1.6.0/utils/hashtest2.c Thu Apr 10 17:23:14 2008
@@ -45,11 +45,12 @@
int testno = 2;
/* stuff we need to make this work with the astobj2 stuff */
-
+#if !defined(LOW_MEMORY)
int64_t ast_mark(int prof_id, int x)
{
return 0;
}
+#endif
/* my OBJECT */
struct ht_element
@@ -311,11 +312,12 @@
return 0;
}
-
+#if !defined(LOW_MEMORY)
int ast_add_profile(const char *x, uint64_t scale)
{
return 0;
}
+#endif
int ast_loader_register(int (*updater)(void))
{
@@ -335,10 +337,12 @@
}
+void ast_register_file_version(const char *file, const char *version);
void ast_register_file_version(const char *file, const char *version)
{
}
+void ast_unregister_file_version(const char *file);
void ast_unregister_file_version(const char *file)
{
More information about the asterisk-commits
mailing list