kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

UGH... while trying to fix #10995, I found all kinds of cruft in this Makefile. It should all be gone now, and as a side effect hashtest2 now builds with --enable-dev-mode enabled without a host of errors

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87498 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2007-10-29 22:44:49 +00:00
parent a4b8ca220d
commit 6ab27c871a
2 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
utils/Makefile
View File

@@ -96,51 +96,45 @@ ast_expr2f.o: ASTCFLAGS+=-DSTANDALONE_AEL -I../main
pval.o : ASTCFLAGS+=-DSTANDALONE pval.o : ASTCFLAGS+=-DSTANDALONE
check_expr: check_expr.o ast_expr2.o ast_expr2f.o strcompat.o clicompat.o ../main/threadstorage.o check_expr: check_expr.o ast_expr2.o ast_expr2f.o strcompat.o clicompat.o threadstorage.o
aelbison.c: ../res/ael/ael.tab.c aelbison.c: ../res/ael/ael.tab.c
@cp $< $@ @cp $< $@
aelbison.o: aelbison.c ../res/ael/ael.tab.h ../include/asterisk/ael_structs.h
aelbison.o: ASTCFLAGS+=-I../res/ael -DYYENABLE_NLS=0 aelbison.o: ASTCFLAGS+=-I../res/ael -DYYENABLE_NLS=0
pbx_ael.c: ../pbx/pbx_ael.c pbx_ael.c: ../pbx/pbx_ael.c
@cp $< $@ @cp $< $@
pbx_ael.o: ASTCFLAGS+=-DSTANDALONE_AEL
ael_main.o: ael_main.c ../include/asterisk/ael_structs.h pbx_ael.o: ASTCFLAGS+=-DSTANDALONE_AEL
aelparse.c: ../res/ael/ael_lex.c aelparse.c: ../res/ael/ael_lex.c
@cp $< $@ @cp $< $@
aelparse.o: aelparse.c ../include/asterisk/ael_structs.h ../res/ael/ael.tab.h
aelparse.o: ASTCFLAGS+=-I../res -DSTANDALONE_AEL aelparse.o: ASTCFLAGS+=-I../res -DSTANDALONE_AEL
aelparse: aelparse.o aelbison.o pbx_ael.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o aelparse: aelparse.o aelbison.o pbx_ael.o ael_main.o ast_expr2f.o ast_expr2.o strcompat.o pval.o extconf.o
astobj2.c : ../main/astobj2.c ../include/asterisk/astobj2.h astobj2.c: ../main/astobj2.c
cp ../main/astobj2.c . @cp $< $@
utils.c : ../main/utils.c utils.c: ../main/utils.c
cp ../main/utils.c . @cp $< $@
sha1.c : ../main/sha1.c sha1.c: ../main/sha1.c
cp ../main/sha1.c . @cp $< $@
sha1.o : sha1.c threadstorage.c: ../main/threadstorage.c
utils.o : utils.c @cp $< $@
astobj2.o : astobj2.c hashtest2.o: ASTCFLAGS+=-O0
hashtest2.o : hashtest2.c hashtest2: hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o
$(CC) -g -O0 -c hashtest2.c $(PTHREAD_CFLAGS) -I/usr/include -I../include
hashtest2 : hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o ../main/threadstorage.o clicompat.o
$(CC) -g -O0 -o hashtest2 hashtest2.o astobj2.o utils.o md5.o sha1.o strcompat.o ../main/threadstorage.o clicompat.o $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBS)
extconf.o : extconf.c extconf.o : extconf.c
conf2ael: conf2ael.o ast_expr2f.o ast_expr2.o aelbison.o aelparse.o pbx_ael.o pval.o extconf.o strcompat.o conf2ael: conf2ael.o ast_expr2f.o ast_expr2.o aelbison.o aelparse.o pbx_ael.o pval.o extconf.o strcompat.o
testexpr2s: ../main/ast_expr2f.c ../main/ast_expr2.c ../main/ast_expr2.h testexpr2s: ../main/ast_expr2f.c ../main/ast_expr2.c ../main/ast_expr2.h
$(CC) -g -c -I../include -DSTANDALONE_AEL ../main/ast_expr2f.c -o ast_expr2f.o $(CC) -g -c -I../include -DSTANDALONE_AEL ../main/ast_expr2f.c -o ast_expr2f.o
$(CC) -g -c -I../include -DSTANDALONE_AEL ../main/ast_expr2.c -o ast_expr2.o $(CC) -g -c -I../include -DSTANDALONE_AEL ../main/ast_expr2.c -o ast_expr2.o

27
utils/hashtest2.c
View File

@@ -59,6 +59,7 @@ int testno = 2;
int64_t ast_mark(int prof_id, int x) int64_t ast_mark(int prof_id, int x)
{ {
return 0;
} }
/* my OBJECT */ /* my OBJECT */
@@ -71,7 +72,7 @@ struct ht_element
static int hash_string(const void *obj, const int flags) static int hash_string(const void *obj, const int flags)
{ {
unsigned char *str = ((struct ht_element*)obj)->key; char *str = ((struct ht_element*)obj)->key;
int total; int total;
for (total=0; *str; str++) for (total=0; *str; str++)
@@ -97,7 +98,7 @@ static int hashtab_compare_strings(void *a, void *b, int flags)
/* random numbers */ /* random numbers */
my_rand(int incl_low, int incl_high, unsigned int *seedp) static int my_rand(int incl_low, int incl_high, unsigned int *seedp)
{ {
if (incl_high == 0) if (incl_high == 0)
return 0; return 0;
@@ -121,7 +122,7 @@ int els_traversals = 0;
/* all the operations to perform on the hashtab */ /* all the operations to perform on the hashtab */
void ht_destroy(void *obj) static void ht_destroy(void *obj)
{ {
const struct ht_element *o = obj; const struct ht_element *o = obj;
if (o->key) if (o->key)
@@ -219,13 +220,13 @@ static void *hashtest(void *data)
int my_els_found = 0; int my_els_found = 0;
int my_els_traversals = 0; int my_els_traversals = 0;
int my_testno = testno++; int my_testno = testno++;
int its;
/* data will be a random number == use as a seed for random numbers */ /* data will be a random number == use as a seed for random numbers */
unsigned long seed = (unsigned long)data; unsigned long seed = (unsigned long)data;
printf("hashtest thread created... test beginning\n"); printf("hashtest thread created... test beginning\n");
/* main test routine-- a global hashtab exists, pound it like crazy */ /* main test routine-- a global hashtab exists, pound it like crazy */
int its;
for(its=0;its<100000;its++) for(its=0;its<100000;its++)
{ {
void *seed2 = &seed; void *seed2 = &seed;
@@ -269,7 +270,7 @@ static void *hashtest(void *data)
pthread_exit(0); pthread_exit(0);
} }
void run_hashtest(int numthr) static void run_hashtest(int numthr)
{ {
pthread_t thr[numthr]; pthread_t thr[numthr];
void *thrres[numthr]; void *thrres[numthr];
@@ -321,13 +322,9 @@ int main(int argc,char **argv)
} }
struct ast_app *pbx_findapp(const char *app) int ast_add_profile(const char *x, uint64_t scale)
{
return (struct ast_app*)1; /* so as not to trigger an error */
}
int ast_add_profile(const char *x, uint64_t scale)
{ {
return 0;
} }
int ast_loader_register(int (*updater)(void)) int ast_loader_register(int (*updater)(void))
@@ -357,14 +354,6 @@ void ast_unregister_file_version(const char *file)
} }
void ast_cli_unregister_multiple(void)
{
}
void ast_context_destroy(void)
{
}
void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
{ {
va_list vars; va_list vars;