Changeset 102178 in vbox

Timestamp:

Nov 21, 2023 9:20:06 AM (17 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160303

Message:

libs/xpcom: Remove more unused code, bugref:10545

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr

Files:

• include/private/primpl.h (modified) (2 diffs)
• include/prtime.h (modified) (2 diffs)
• src/misc/prtime.c (deleted)
• src/pthreads/ptio.c (modified) (2 diffs)
• src/pthreads/ptsynch.c (modified) (8 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/include/private/primpl.h

@@ -115 +115 @@
 */
 
-#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-#define PT_FPrintStats VBoxNsprPT_FPrintStats
-#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
-
 PR_BEGIN_EXTERN_C
 
@@ -181 +177 @@
 #define PT_THREAD_RESUMED   0x80    /* thread has been resumed */
 #define PT_THREAD_SETGCABLE 0x100   /* set the GCAble flag */
-
-#if defined(DEBUG)
-
-typedef struct PTDebug
-{
-    PRTime timeStarted;
-    PRUintn locks_created, locks_destroyed;
-    PRUintn locks_acquired, locks_released;
-    PRUintn cvars_created, cvars_destroyed;
-    PRUintn cvars_notified, delayed_cv_deletes;
-} PTDebug;
-
-#endif /* defined(DEBUG) */
-
-NSPR_API(void) PT_FPrintStats(PRFileDesc *fd, const char *msg);
 
 /************************************************************************/

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prtime.h

@@ -56 +56 @@
 #define PR_ImplodeTime VBoxNsprPR_ImplodeTime
 #define PR_NormalizeTime VBoxNsprPR_NormalizeTime
-#define PR_LocalTimeParameters VBoxNsprPR_LocalTimeParameters
-#define PR_GMTParameters VBoxNsprPR_GMTParameters
-#define PR_USPacificTimeParameters VBoxNsprPR_USPacificTimeParameters
-#define PR_ParseTimeString VBoxNsprPR_ParseTimeString
-#define PR_FormatTime VBoxNsprPR_FormatTime
-#define PR_FormatTimeUSEnglish VBoxNsprPR_FormatTimeUSEnglish
 #endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
@@ -231 +225 @@
     PRExplodedTime *exploded, PRTimeParamFn params);
 
-/**********************************************************************/
-/*********************** TIME PARAMETER FUNCTIONS *********************/
-/**********************************************************************/
-
-/* Time parameters that suit current host machine */
-NSPR_API(PRTimeParameters) PR_LocalTimeParameters(const PRExplodedTime *gmt);
-
-/* Time parameters that represent Greenwich Mean Time */
-NSPR_API(PRTimeParameters) PR_GMTParameters(const PRExplodedTime *gmt);
-
-/*
- * Time parameters that represent the US Pacific Time Zone, with the
- * current daylight saving time rules (for testing only)
- */
-NSPR_API(PRTimeParameters) PR_USPacificTimeParameters(const PRExplodedTime *gmt);
-
-/*
- * This parses a time/date string into a PRTime
- * (microseconds after "1-Jan-1970 00:00:00 GMT").
- * It returns PR_SUCCESS on success, and PR_FAILURE
- * if the time/date string can't be parsed.
- *
- * Many formats are handled, including:
- *
- *   14 Apr 89 03:20:12
- *   14 Apr 89 03:20 GMT
- *   Fri, 17 Mar 89 4:01:33
- *   Fri, 17 Mar 89 4:01 GMT
- *   Mon Jan 16 16:12 PDT 1989
- *   Mon Jan 16 16:12 +0130 1989
- *   6 May 1992 16:41-JST (Wednesday)
- *   22-AUG-1993 10:59:12.82
- *   22-AUG-1993 10:59pm
- *   22-AUG-1993 12:59am
- *   22-AUG-1993 12:59 PM
- *   Friday, August 04, 1995 3:54 PM
- *   06/21/95 04:24:34 PM
- *   20/06/95 21:07
- *   95-06-08 19:32:48 EDT
- *
- * If the input string doesn't contain a description of the timezone,
- * we consult the `default_to_gmt' to decide whether the string should
- * be interpreted relative to the local time zone (PR_FALSE) or GMT (PR_TRUE).
- * The correct value for this argument depends on what standard specified
- * the time string which you are parsing.
- */
-
-NSPR_API(PRStatus) PR_ParseTimeString (
-        const char *string,
-        PRBool default_to_gmt,
-        PRTime *result);
-
-/*
- * FIXME: should we also have a formatting function, such as asctime, ctime,
- * and strftime in standard C library?  But this would involve
- * internationalization issues.  Might want to provide a US English version.
- */
-
-/**********************************************************************/
-/*********************** OLD COMPATIBILITYFUNCTIONS *******************/
-/**********************************************************************/
-#ifndef NO_NSPR_10_SUPPORT
-
-/* Format a time value into a buffer. Same semantics as strftime() */
-NSPR_API(PRUint32) PR_FormatTime(char *buf, int buflen, const char *fmt, 
-                                           const PRExplodedTime *tm);
-
-/* Format a time value into a buffer. Time is always in US English format, regardless
- * of locale setting.
- */
-NSPR_API(PRUint32)
-PR_FormatTimeUSEnglish( char* buf, PRUint32 bufSize,
-                        const char* format, const PRExplodedTime* tm );
-
-#endif /* NO_NSPR_10_SUPPORT */
-
 PR_END_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptio.c

@@ -123 +123 @@
     pr_ContuationStatus status;             /* the status of the operation */
 };
-
-#if defined(DEBUG)
-
-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
-
-PR_IMPLEMENT(void) PT_FPrintStats(PRFileDesc *debug_out, const char *msg)
-{
-    /* do nothing */
-}  /* PT_FPrintStats */
-
-#endif  /* DEBUG */
 
 /*
@@ -434 +390 @@
 void _PR_InitIO(void)
 {
-#if defined(DEBUG)
-    memset(&pt_debug, 0, sizeof(PTDebug));
-    pt_debug.timeStarted = PR_Now();
-#endif
-
     _pr_rename_lock = PR_NewLock();
     Assert(NULL != _pr_rename_lock);

trunk/src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c

@@ -58 +58 @@
 static pthread_mutexattr_t _pt_mattr;
 static pthread_condattr_t _pt_cvar_attr;
-
-#if defined(DEBUG)
-extern PTDebug pt_debug;  /* this is shared between several modules */
-#endif  /* defined(DEBUG) */
 
 /**************************************************************/
@@ -134 +130 @@
                 }
             }
-#if defined(DEBUG)
-            pt_debug.cvars_notified += 1;
-            if (0 > ASMAtomicDecS32(&cv->notify_pending))
-            {
-                pt_debug.delayed_cv_deletes += 1;
-                PR_DestroyCondVar(cv);
-            }
-#else  /* defined(DEBUG) */
             if (0 > ASMAtomicDecS32(&cv->notify_pending))
                 PR_DestroyCondVar(cv);
-#endif  /* defined(DEBUG) */
         }
         prev = notified;
@@ -165 +152 @@
         Assert(0 == rv);
     }
-#if defined(DEBUG)
-    pt_debug.locks_created += 1;
-#endif
     return lock;
 }  /* PR_NewLock */
@@ -182 +166 @@
 #if defined(DEBUG)
     memset(lock, 0xaf, sizeof(PRLock));
-    pt_debug.locks_destroyed += 1;
 #endif
     PR_DELETE(lock);
@@ -198 +181 @@
     lock->locked = PR_TRUE;
     lock->owner = pthread_self();
-#if defined(DEBUG)
-    pt_debug.locks_acquired += 1;
-#endif
 }  /* PR_Lock */
 
@@ -223 +203 @@
     else pt_PostNotifies(lock, PR_TRUE);
 
-#if defined(DEBUG)
-    pt_debug.locks_released += 1;
-#endif
     return PR_SUCCESS;
 }  /* PR_Unlock */
@@ -329 +306 @@
         cv->lock = lock;
         cv->notify_pending = 0;
-#if defined(DEBUG)
-        pt_debug.cvars_created += 1;
-#endif
     }
     return cv;
@@ -341 +315 @@
     {
         PRIntn rv = pthread_cond_destroy(&cvar->cv); Assert(0 == rv);
-#if defined(DEBUG)
-        memset(cvar, 0xaf, sizeof(PRCondVar));
-        pt_debug.cvars_destroyed += 1;
-#endif
         PR_DELETE(cvar);
     }