Author: mikej Date: Tue Apr 10 20:57:46 2007 New Revision: 4914 Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/io/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/io/pripv6.c freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/prmem.c freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/objs.mk freeswitch/trunk/libs/js/nsprpub/pr/src/memory/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/misc/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/Makefile.in freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptio.c freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c freeswitch/trunk/libs/js/nsprpub/pr/src/threads/Makefile.in Log: working nspr slimmed down build Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/Makefile.in Tue Apr 10 20:57:46 2007 @@ -46,7 +46,7 @@ include $(topsrcdir)/config/config.mk -DIRS = io linking malloc md memory misc threads +DIRS = io malloc md memory misc threads # For VAC++ 4 geticcdata rule in config/OS2.mk ifeq ($(MOZ_OS2_TOOLS),VACPP) @@ -62,7 +62,7 @@ endif ifeq ($(USE_CPLUS), 1) - DIRS += cplus +# DIRS += cplus endif # @@ -222,45 +222,24 @@ $(OBJDIR)/prvrsion.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prfdcach.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prmwait.$(OBJ_SUFFIX) \ -# io/$(OBJDIR)/prmapopt.$(OBJ_SUFFIX) \ io/$(OBJDIR)/priometh.$(OBJ_SUFFIX) \ -# io/$(OBJDIR)/pripv6.$(OBJ_SUFFIX) \ + io/$(OBJDIR)/prmapopt.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prlayer.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prlog.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prmmap.$(OBJ_SUFFIX) \ -# io/$(OBJDIR)/prpolevt.$(OBJ_SUFFIX) \ + io/$(OBJDIR)/pripv6.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prprf.$(OBJ_SUFFIX) \ -# io/$(OBJDIR)/prscanf.$(OBJ_SUFFIX) \ -# io/$(OBJDIR)/prstdio.$(OBJ_SUFFIX) \ -# threads/$(OBJDIR)/prcmon.$(OBJ_SUFFIX) \ -# threads/$(OBJDIR)/prrwlock.$(OBJ_SUFFIX) \ threads/$(OBJDIR)/prtpd.$(OBJ_SUFFIX) \ -# linking/$(OBJDIR)/prlink.$(OBJ_SUFFIX) \ malloc/$(OBJDIR)/prmem.$(OBJ_SUFFIX) \ md/$(OBJDIR)/prosdep.$(OBJ_SUFFIX) \ -# memory/$(OBJDIR)/prshm.$(OBJ_SUFFIX) \ -# memory/$(OBJDIR)/prshma.$(OBJ_SUFFIX) \ memory/$(OBJDIR)/prseg.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/pralarm.$(OBJ_SUFFIX) \ + misc/$(OBJDIR)/prnetdb.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/pratom.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prcountr.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prdtoa.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prenv.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prerr.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prerror.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prerrortable.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prinit.$(OBJ_SUFFIX) \ + misc/$(OBJDIR)/pripc.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prinrval.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/pripc.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prlog2.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prlong.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prnetdb.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prolock.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prrng.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prsystem.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prthinfo.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prtpool.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/prtrace.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prtime.$(OBJ_SUFFIX) # ilib now rejects empty objects @@ -278,16 +257,12 @@ OBJS += \ io/$(OBJDIR)/prdir.$(OBJ_SUFFIX) \ io/$(OBJDIR)/prfile.$(OBJ_SUFFIX) \ - io/$(OBJDIR)/prio.$(OBJ_SUFFIX) \ -# io/$(OBJDIR)/prsocket.$(OBJ_SUFFIX) \ -# misc/$(OBJDIR)/pripcsem.$(OBJ_SUFFIX) + io/$(OBJDIR)/prio.$(OBJ_SUFFIX) + ifndef USE_BTHREADS OBJS += \ threads/$(OBJDIR)/prcthr.$(OBJ_SUFFIX) \ -# threads/$(OBJDIR)/prdump.$(OBJ_SUFFIX) \ -# threads/$(OBJDIR)/prmon.$(OBJ_SUFFIX) \ -# threads/$(OBJDIR)/prsem.$(OBJ_SUFFIX) \ threads/combined/$(OBJDIR)/prucpu.$(OBJ_SUFFIX) \ threads/combined/$(OBJDIR)/prucv.$(OBJ_SUFFIX) \ threads/combined/$(OBJDIR)/prulock.$(OBJ_SUFFIX) \ Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/io/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/io/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/io/Makefile.in Tue Apr 10 20:57:46 2007 @@ -58,14 +58,11 @@ prmwait.c \ priometh.c \ pripv6.c \ - prmapopt.c \ + prmapopt.c \ prlayer.c \ prlog.c \ prmmap.c \ - prpolevt.c \ prprf.c \ - prscanf.c \ - prstdio.c \ $(NULL) ifndef USE_PTHREADS @@ -73,7 +70,6 @@ prdir.c \ prfile.c \ prio.c \ - prsocket.c \ $(NULL) endif Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/io/pripv6.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/io/pripv6.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/io/pripv6.c Tue Apr 10 20:57:46 2007 @@ -279,7 +279,6 @@ #if defined(_PR_INET6_PROBE) PRBool _pr_ipv6_is_present; -extern PRBool _pr_test_ipv6_socket(void); #if !defined(_PR_INET6) && defined(_PR_HAVE_GETIPNODEBYNAME) extern PRStatus _pr_find_getipnodebyname(void); @@ -292,17 +291,7 @@ static PRBool _pr_probe_ipv6_presence(void) { -#if !defined(_PR_INET6) && defined(_PR_HAVE_GETIPNODEBYNAME) - if (_pr_find_getipnodebyname() != PR_SUCCESS) return PR_FALSE; -#endif - -#if !defined(_PR_INET6) && defined(_PR_HAVE_GETADDRINFO) - if (_pr_find_getaddrinfo() != PR_SUCCESS) - return PR_FALSE; -#endif - - return _pr_test_ipv6_socket(); } #endif /* _PR_INET6_PROBE */ Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/Makefile.in Tue Apr 10 20:57:46 2007 @@ -59,7 +59,7 @@ DEFINES += -D_NSPR_BUILD_ -CSRCS = prmalloc.c prmem.c +CSRCS = prmem.c include $(topsrcdir)/config/rules.mk Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/prmem.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/prmem.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/malloc/prmem.c Tue Apr 10 20:57:46 2007 @@ -210,25 +210,6 @@ return; } -PR_IMPLEMENT(void) -PR_FPrintZoneStats(PRFileDesc *debug_out) -{ - int i, j; - - for (j = 0; j < THREAD_POOLS; j++) { - for (i = 0; i < MEM_ZONES; i++) { - MemoryZone *mz = &zones[i][j]; - MemoryZone zone = *mz; - if (zone.elements || zone.misses || zone.hits) { - PR_fprintf(debug_out, -"pool: %d, zone: %d, size: %d, free: %d, hit: %d, miss: %d, contend: %d\n", - j, i, zone.blockSize, zone.elements, - zone.hits, zone.misses, zone.contention); - } - } - } -} - static void * pr_ZoneMalloc(PRUint32 size) { Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/Makefile.in Tue Apr 10 20:57:46 2007 @@ -49,8 +49,6 @@ unix.c \ unix_errors.c \ uxproces.c \ - uxrng.c \ - uxshm.c \ uxwrap.c \ $(NULL) Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/objs.mk ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/objs.mk (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/objs.mk Tue Apr 10 20:57:46 2007 @@ -42,8 +42,6 @@ unix.c \ unix_errors.c \ uxproces.c \ - uxrng.c \ - uxshm.c \ uxwrap.c \ $(NULL) Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/memory/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/memory/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/memory/Makefile.in Tue Apr 10 20:57:46 2007 @@ -46,7 +46,7 @@ include $(topsrcdir)/config/config.mk -CSRCS = prseg.c prshm.c prshma.c +CSRCS = prseg.c ifdef GC_LEAK_DETECTOR CSRCS += prgcleak.c Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/misc/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/misc/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/misc/Makefile.in Tue Apr 10 20:57:46 2007 @@ -47,35 +47,16 @@ include $(topsrcdir)/config/config.mk CSRCS = \ - pralarm.c \ pratom.c \ - prcountr.c \ - prdtoa.c \ - prenv.c \ - prerr.c \ prerror.c \ - prerrortable.c \ + pripc.c \ prinit.c \ + prnetdb.c \ prinrval.c \ - pripc.c \ - prlog2.c \ - prlong.c \ - prnetdb.c \ prolock.c \ - prrng.c \ - prsystem.c \ prtime.c \ - prthinfo.c \ - prtpool.c \ - prtrace.c \ $(NULL) -ifndef USE_PTHREADS -CSRCS += \ - pripcsem.c \ - $(NULL) -endif - TARGETS = $(OBJS) INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/Makefile.in Tue Apr 10 20:57:46 2007 @@ -55,8 +55,8 @@ endif CSRCS = \ + ptsynch.c \ ptio.c \ - ptsynch.c \ ptthread.c \ ptmisc.c \ $(NULL) Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptio.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptio.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptio.c Tue Apr 10 20:57:46 2007 @@ -374,46 +374,13 @@ PTDebug pt_debug; /* this is shared between several modules */ -PR_IMPLEMENT(void) PT_FPrintStats(PRFileDesc *debug_out, const char *msg) -{ - PTDebug stats; - char buffer[100]; - PRExplodedTime tod; - PRInt64 elapsed, aMil; - stats = pt_debug; /* a copy */ - PR_ExplodeTime(stats.timeStarted, PR_LocalTimeParameters, &tod); - (void)PR_FormatTime(buffer, sizeof(buffer), "%T", &tod); - - LL_SUB(elapsed, PR_Now(), stats.timeStarted); - LL_I2L(aMil, 1000000); - LL_DIV(elapsed, elapsed, aMil); - - if (NULL != msg) PR_fprintf(debug_out, "%s", msg); - PR_fprintf( - debug_out, "\tstarted: %s[%lld]\n", buffer, elapsed); - PR_fprintf( - debug_out, "\tlocks [created: %u, destroyed: %u]\n", - stats.locks_created, stats.locks_destroyed); - PR_fprintf( - debug_out, "\tlocks [acquired: %u, released: %u]\n", - stats.locks_acquired, stats.locks_released); - PR_fprintf( - debug_out, "\tcvars [created: %u, destroyed: %u]\n", - stats.cvars_created, stats.cvars_destroyed); - PR_fprintf( - debug_out, "\tcvars [notified: %u, delayed_delete: %u]\n", - stats.cvars_notified, stats.delayed_cv_deletes); -} /* PT_FPrintStats */ - -#else +#endif /* DEBUG */ PR_IMPLEMENT(void) PT_FPrintStats(PRFileDesc *debug_out, const char *msg) { /* do nothing */ } /* PT_FPrintStats */ -#endif /* DEBUG */ - #if defined(_PR_POLL_WITH_SELECT) /* * OSF1 and HPUX report the POLLHUP event for a socket when the @@ -3374,6 +3341,8 @@ return fd; } /* PR_AllocFileDesc */ +#if 0 + #if !defined(_PR_INET6) || defined(_PR_INET6_PROBE) PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd); #if defined(_PR_INET6_PROBE) @@ -3484,7 +3453,7 @@ #endif return fd; } /* PR_Socket */ - +#endif /*****************************************************************************/ /****************************** I/O public methods ***************************/ /*****************************************************************************/ @@ -4312,6 +4281,7 @@ return &dir->d; } /* PR_ReadDir */ +#if 0 PR_IMPLEMENT(PRFileDesc*) PR_NewUDPSocket(void) { PRIntn domain = PF_INET; @@ -4336,6 +4306,8 @@ return PR_Socket(af, SOCK_STREAM, 0); } /* PR_NewTCPSocket */ +#endif + PR_IMPLEMENT(PRStatus) PR_NewTCPSocketPair(PRFileDesc *fds[2]) { PRInt32 osfd[2]; Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/pthreads/ptthread.c Tue Apr 10 20:57:46 2007 @@ -938,9 +938,9 @@ PR_Unlock(pt_book.ml); _PR_CleanupMW(); - _PR_CleanupDtoa(); + //_PR_CleanupDtoa(); _PR_CleanupCallOnce(); - _PR_ShutdownLinker(); + //_PR_ShutdownLinker(); _PR_LogCleanup(); _PR_CleanupNet(); /* Close all the fd's before calling _PR_CleanupIO */ @@ -963,7 +963,7 @@ PR_DestroyLock(_pr_sleeplock); _pr_sleeplock = NULL; _PR_CleanupLayerCache(); - _PR_CleanupEnv(); + //_PR_CleanupEnv(); #ifdef _PR_ZONE_ALLOCATOR _PR_DestroyZones(); #endif Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/threads/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/threads/Makefile.in (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/threads/Makefile.in Tue Apr 10 20:57:46 2007 @@ -58,24 +58,15 @@ ifdef USE_PTHREADS CSRCS = \ - prcmon.c \ - prrwlock.c \ prtpd.c \ $(NULL) else ifdef USE_BTHREADS CSRCS = \ - prcmon.c \ - prrwlock.c \ prtpd.c \ $(NULL) else CSRCS = \ - prcmon.c \ - prdump.c \ - prmon.c \ - prsem.c \ - prrwlock.c \ prcthr.c \ prtpd.c \ $(NULL)