TIP #590: Make "thread" available as lower-case package name too

Author: jan.nijtmans

doc/thread.man

@@ -3,7 +3,7 @@
 [moddesc {Tcl Threading}]
 [titledesc {Extension for script access to Tcl threading}]
 [require Tcl 8.5]
-[require Thread [opt 2.8]]
+[require thread [opt 2.8]]
 
 [description]
 The [package thread] extension creates threads that contain Tcl

doc/tpool.man

@@ -3,7 +3,7 @@
 [moddesc {Tcl Threading}]
 [titledesc {Part of the Tcl threading extension implementing pools of worker threads.}]
 [require Tcl 8.5]
-[require Thread [opt 2.8]]
+[require thread [opt 2.8]]
 
 [description]
 This package creates and manages pools of worker threads. It allows you

doc/tsv.man

@@ -3,7 +3,7 @@
 [moddesc {Tcl Threading}]
 [titledesc {Part of the Tcl threading extension allowing script level manipulation of data shared between threads.}]
 [require Tcl 8.5]
-[require Thread [opt 2.8]]
+[require thread [opt 2.8]]
 
 [description]
 This section describes commands implementing thread shared variables.

doc/ttrace.man

@@ -3,7 +3,7 @@
 [moddesc {Tcl Threading}]
 [titledesc {Trace-based interpreter initialization}]
 [require Tcl 8.5]
-[require Thread [opt 2.8]]
+[require thread [opt 2.8]]
 
 [description]
 This package creates a framework for on-demand replication of the
@@ -20,17 +20,17 @@ with the Tcl threading extension:
 
 [example {
 
-    % package require Ttrace
-    2.8.2
+    % package require ttrace
+    2.9.0
 
-    % set t1 [thread::create {package require Ttrace; thread::wait}]
+    % set t1 [thread::create {package require ttrace; thread::wait}]
     tid0x1802800
 
     % ttrace::eval {proc test args {return test-[thread::id]}}
     % thread::send $t1 test
     test-tid0x1802800
 
-    % set t2 [thread::create {package require Ttrace; thread::wait}]
+    % set t2 [thread::create {package require ttrace; thread::wait}]
     tid0x1804000
 
     % thread::send $t2 test

generic/threadCmd.c

@@ -540,7 +540,8 @@ Thread_Init(
         return status;
     }
 
-    return Tcl_PkgProvideEx(interp, "Thread", PACKAGE_VERSION, NULL);
+    Tcl_PkgProvideEx(interp, "Thread", PACKAGE_VERSION, NULL);
+    return Tcl_PkgProvideEx(interp, "thread", PACKAGE_VERSION, NULL);
 }
 
 /*

lib/ttrace.tcl

@@ -73,6 +73,7 @@ namespace eval ttrace {
     }
 
     # Keep in sync with the Thread package
+    package provide ttrace 2.9a1
     package provide Ttrace 2.9a1
 
     # Package variables
@@ -116,7 +117,7 @@ namespace eval ttrace {
                 ns_ictl save [getscript]
             } else {
                 thread::broadcast {
-                    package require Ttrace
+                    package require ttrace
                     ttrace::update
                 }
             }

pkgIndex.tcl.in

@@ -11,24 +11,36 @@ if {![package vsatisfies [package provide Tcl] 8.5]} {
     }
 }
 
-# All Tcl 8.5+ interps can [load] Thread @PACKAGE_VERSION@
+# All Tcl 8.5+ interps can [load] thread @PACKAGE_VERSION@
 #
 # For interps that are not thread-enabled, we still call [package ifneeded].
 # This is contrary to the usual convention, but is a good idea because we
 # cannot imagine any other version of Thread that might succeed in a
 # thread-disabled interp.  There's nothing to gain by yielding to other
-# competing callers of [package ifneeded Thread].  On the other hand,
+# competing callers of [package ifneeded thread].  On the other hand,
 # deferring the error has the advantage that a script calling
-# [package require Thread] in a thread-disabled interp gets an error message
+# [package require thread] in a thread-disabled interp gets an error message
 # about a thread-disabled interp, instead of the message
 # "can't find package Thread".
 
-package ifneeded Thread @PACKAGE_VERSION@ [list load [file join $dir @PKG_LIB_FILE@] [string totitle @PACKAGE_NAME@]]
+package ifneeded [string tolower @PACKAGE_NAME@] @PACKAGE_VERSION@ [list load [file join $dir @PKG_LIB_FILE@] [string totitle @PACKAGE_NAME@]]
+package ifneeded [string totitle @PACKAGE_NAME@] @PACKAGE_VERSION@ [list load [file join $dir @PKG_LIB_FILE@] [string totitle @PACKAGE_NAME@]]
 
 # package Ttrace uses some support machinery.
 
-# In Tcl 8.5+ interps; use [::apply]
-
+package ifneeded ttrace @PACKAGE_VERSION@ [list ::apply {{dir} {
+    if {[info exists ::env(TCL_THREAD_LIBRARY)] &&
+	[file readable $::env(TCL_THREAD_LIBRARY)/ttrace.tcl]} {
+	source $::env(TCL_THREAD_LIBRARY)/ttrace.tcl
+    } elseif {[file readable [file join $dir .. lib ttrace.tcl]]} {
+	source [file join $dir .. lib ttrace.tcl]
+    } elseif {[file readable [file join $dir ttrace.tcl]]} {
+	source [file join $dir ttrace.tcl]
+    }
+    if {[namespace which ::ttrace::update] ne ""} {
+	::ttrace::update
+    }
+}} $dir]
 package ifneeded Ttrace @PACKAGE_VERSION@ [list ::apply {{dir} {
     if {[info exists ::env(TCL_THREAD_LIBRARY)] &&
 	[file readable $::env(TCL_THREAD_LIBRARY)/ttrace.tcl]} {

tests/all.tcl

@@ -9,7 +9,7 @@
 
 package require tcltest
 ::tcltest::loadTestedCommands
-package require Thread
+package require -exact thread 2.9a1
 
 set ::tcltest::testSingleFile false
 set ::tcltest::testsDirectory [file dir [info script]]
@@ -39,7 +39,7 @@ puts stdout "Tests began at [eval $timeCmd]"
 # These tests need to know which is the main thread
 set ::tcltest::mainThread [thread::id]
 
-puts stdout "Thread [package provide Thread]"
+puts stdout "thread [package provide thread]"
 puts stdout "Mainthread id is $::tcltest::mainThread"
 
 # Source each of the specified tests

tests/store-load.tcl

@@ -1,7 +1,7 @@
 #!/usr/bin/env tclsh
 
 lappend auto_path .
-package require Thread
+package require thread
 
 if {[llength $argv] != 3} {
     puts "Usage: $argv0 handle path times"

tests/thread.test

@@ -14,7 +14,7 @@
 package require tcltest
 namespace import ::tcltest::*
 tcltest::loadTestedCommands
-package require Thread
+package require thread
 
 tcltest::testConstraint chanTransfer               \
     [expr {$::tcl_platform(platform) == "unix"}]

tests/tkt-84be1b5a73.test

@@ -1,7 +1,7 @@
 package require tcltest
 namespace import ::tcltest::*
 tcltest::loadTestedCommands
-package require Thread
+package require thread
 
 # This test used to segfault before commit f4c95731c0.
 test tkt-84be1b5a73 {Ticket 84be1b5a73} -body {

tests/tsv.test

@@ -1,7 +1,7 @@
 package require tcltest
 namespace import ::tcltest::*
 tcltest::loadTestedCommands
-package require Thread
+package require thread
 
 set backends {gdbm lmdb}
 

unix/CONFIG

@@ -38,7 +38,7 @@
 #   --prefix=$nsdir --exec-prefix=$nsdir
 #
 # NaviServer/AOLserver uses its own package loading mechanism.
-# To load, just do "ns_eval package require Thread"
+# To load, just do "ns_eval package require thread"
 # at the NaviServer/AOLserver startup or later from any thread.
 #
 #