Merge core-8-6-branch. This removes the work currently being done in "sebres-8-6-clock-speedup-cr1" branch, but that will be merged again as soon as the work is done.

All other changes in "trunk" since then (e.g. the INST_STR_CONCAT1 performance improvement, and the removal of SunOS-4) are retained.

2 files changed, 2 insertions, 81 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 91d9231..12d4a6d 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -292,7 +292,7 @@ XTTEST_OBJS = xtTestInit.o tclTest.o tclTestObj.o tclTestProcBodyObj.o \
 
 GENERIC_OBJS = regcomp.o regexec.o regfree.o regerror.o tclAlloc.o \
 	tclAssembly.o tclAsync.o tclBasic.o tclBinary.o tclCkalloc.o \
-	tclClock.o tclClockFmt.o tclCmdAH.o tclCmdIL.o tclCmdMZ.o \
+	tclClock.o tclCmdAH.o tclCmdIL.o tclCmdMZ.o \
 	tclCompCmds.o tclCompCmdsGR.o tclCompCmdsSZ.o tclCompExpr.o \
 	tclCompile.o tclConfig.o tclDate.o tclDictObj.o tclDisassemble.o \
 	tclEncoding.o tclEnsemble.o \
@@ -304,7 +304,7 @@ GENERIC_OBJS = regcomp.o regexec.o regfree.o regerror.o tclAlloc.o \
 	tclObj.o tclOptimize.o tclPanic.o tclParse.o tclPathObj.o tclPipe.o \
 	tclPkg.o tclPkgConfig.o tclPosixStr.o \
 	tclPreserve.o tclProc.o tclRegexp.o \
-	tclResolve.o tclResult.o tclScan.o tclStringObj.o tclStrIdxTree.o \
+	tclResolve.o tclResult.o tclScan.o tclStringObj.o \
 	tclStrToD.o tclThread.o \
 	tclThreadAlloc.o tclThreadJoin.o tclThreadStorage.o tclStubInit.o \
 	tclTimer.o tclTrace.o tclUtf.o tclUtil.o tclVar.o tclZlib.o \
@@ -396,7 +396,6 @@ GENERIC_SRCS = \
 	$(GENERIC_DIR)/tclBinary.c \
 	$(GENERIC_DIR)/tclCkalloc.c \
 	$(GENERIC_DIR)/tclClock.c \
-	$(GENERIC_DIR)/tclClockFmt.c \
 	$(GENERIC_DIR)/tclCmdAH.c \
 	$(GENERIC_DIR)/tclCmdIL.c \
 	$(GENERIC_DIR)/tclCmdMZ.c \
@@ -451,7 +450,6 @@ GENERIC_SRCS = \
 	$(GENERIC_DIR)/tclScan.c \
 	$(GENERIC_DIR)/tclStubInit.c \
 	$(GENERIC_DIR)/tclStringObj.c \
-	$(GENERIC_DIR)/tclStrIdxTree.c \
 	$(GENERIC_DIR)/tclStrToD.c \
 	$(GENERIC_DIR)/tclTest.c \
 	$(GENERIC_DIR)/tclTestObj.c \
@@ -1077,9 +1075,6 @@ tclCkalloc.o: $(GENERIC_DIR)/tclCkalloc.c
 tclClock.o: $(GENERIC_DIR)/tclClock.c
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclClock.c
 
-tclClockFmt.o: $(GENERIC_DIR)/tclClockFmt.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclClockFmt.c
-
 tclCmdAH.o: $(GENERIC_DIR)/tclCmdAH.c
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclCmdAH.c
 
@@ -1308,9 +1303,6 @@ tclScan.o: $(GENERIC_DIR)/tclScan.c
 tclStringObj.o: $(GENERIC_DIR)/tclStringObj.c $(MATHHDRS)
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclStringObj.c
 
-tclStrIdxTree.o: $(GENERIC_DIR)/tclStrIdxTree.c $(MATHHDRS)
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclStrIdxTree.c
-
 tclStrToD.o: $(GENERIC_DIR)/tclStrToD.c $(MATHHDRS)
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclStrToD.c
 
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index 1d8b351..6a73ac2 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.c
@@ -87,32 +87,6 @@ TclpGetSeconds(void)
 /*
  *----------------------------------------------------------------------
  *
- * TclpGetMicroseconds --
- *
- *	This procedure returns the number of microseconds from the epoch.
- *	On most Unix systems the epoch is Midnight Jan 1, 1970 GMT.
- *
- * Results:
- *	Number of microseconds from the epoch.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_WideInt
-TclpGetMicroseconds(void)
-{
-    Tcl_Time time;
-
-    tclGetTimeProcPtr(&time, tclTimeClientData);
-    return ((Tcl_WideInt)time.sec)*1000000 + time.usec;
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TclpGetClicks --
  *
  *	This procedure returns a value that represents the highest resolution
@@ -245,51 +219,6 @@ TclpWideClicksToNanoseconds(
 
     return nsec;
 }
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpWideClickInMicrosec --
- *
- *	This procedure return scale to convert click values from the
- *	TclpGetWideClicks native resolution to microsecond resolution
- *	and back.
- *
- * Results:
- * 	1 click in microseconds as double.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-double
-TclpWideClickInMicrosec(void)
-{
-    if (tclGetTimeProcPtr != NativeGetTime) {
-	return 1.0;
-    } else {
-#ifdef MAC_OSX_TCL
-	static int initialized = 0;
-	static double scale = 0.0;
-
-	if (initialized) {
-	    return scale;
-	} else {
-	    mach_timebase_info_data_t tb;
-
-	    mach_timebase_info(&tb);
-	    /* value of tb.numer / tb.denom = 1 click in nanoseconds */
-	    scale = ((double)tb.numer) / tb.denom / 1000;
-	    initialized = 1;
-	    return scale;
-	}
-#else
-#error Wide high-resolution clicks not implemented on this platform
-#endif
-    }
-}
 #endif /* TCL_WIDE_CLICKS */
 
 /*