Changeset 101812 in vbox for trunk

Timestamp:

Nov 5, 2023 10:47:54 AM (16 months ago)

Author:

vboxsync

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

159908

Message:

libs/xpcom: Merge all the platform specific initialization routines into unix.c as they are pretty much empty now, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• nsprpub/pr/src/md/unix/darwin.c (deleted)
• nsprpub/pr/src/md/unix/freebsd.c (deleted)
• nsprpub/pr/src/md/unix/linux.c (deleted)
• nsprpub/pr/src/md/unix/netbsd.c (deleted)
• nsprpub/pr/src/md/unix/openbsd.c (deleted)
• nsprpub/pr/src/md/unix/solaris.c (deleted)
• nsprpub/pr/src/md/unix/unix.c (modified) (2 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -559 +559 @@
 endif
 
-VBox-xpcom-nspr_SOURCES.darwin  = nsprpub/pr/src/md/unix/darwin.c
-VBox-xpcom-nspr_SOURCES.freebsd = nsprpub/pr/src/md/unix/freebsd.c
-VBox-xpcom-nspr_SOURCES.linux   = nsprpub/pr/src/md/unix/linux.c
-VBox-xpcom-nspr_SOURCES.solaris = nsprpub/pr/src/md/unix/solaris.c
-
 $(call KB_FN_DO_PASS0_ON_TARGET,VBox-xpcom-nspr)
 

trunk/src/libs/xpcom18a4/nsprpub/pr/src/md/unix/unix.c

@@ -59 +59 @@
 #if defined(NTO)
 #include <sys/statvfs.h>
+#endif
+
+#if defined(FREEBSD)
+# include <signal.h>
 #endif
 
@@ -1118 +1122 @@
 }
 #endif /* _PR_NEED_FAKE_POLL */
+
+void _MD_EarlyInit(void)
+{
+#if defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD)
+    /*
+     * Ignore FPE because coercion of a NaN to an int causes SIGFPE
+     * to be raised.
+     */
+    struct sigaction act;
+
+    act.sa_handler = SIG_IGN;
+    sigemptyset(&act.sa_mask);
+    act.sa_flags = SA_RESTART;
+    sigaction(SIGFPE, &act, 0);
+#endif
+}
+
+#if defined(LINUX)
+extern void _MD_unix_terminate_waitpid_daemon(void);
+
+void _MD_CleanupBeforeExit(void)
+{
+    _MD_unix_terminate_waitpid_daemon();
+}
+#endif
+
+#if defined(SOLARIS)
+PRIntervalTime _MD_Solaris_TicksPerSecond(void)
+{
+    /*
+     * Ticks have a 10-microsecond resolution.  So there are
+     * 100000 ticks per second.
+     */
+    return 100000UL;
+}
+
+/* Interval timers, implemented using gethrtime() */
+
+PRIntervalTime _MD_Solaris_GetInterval(void)
+{
+    union {
+        hrtime_t hrt;  /* hrtime_t is a 64-bit (long long) integer */
+        PRInt64 pr64;
+    } time;
+    PRInt64 resolution;
+    PRIntervalTime ticks;
+
+    time.hrt = gethrtime();  /* in nanoseconds */
+    /*
+     * Convert from nanoseconds to ticks.  A tick's resolution is
+     * 10 microseconds, or 10000 nanoseconds.
+     */
+    LL_I2L(resolution, 10000);
+    LL_DIV(time.pr64, time.pr64, resolution);
+    LL_L2UI(ticks, time.pr64);
+    return ticks;
+}
+#endif
+