rename contrib/cpuinfo

diff --git a/contrib/README.txt b/contrib/README.txt
index c6a4c762c8aded52339281fddc227c4c9dc8200b..b01448205ea25d80e3390f0dbd332a00eee9161c 100644 (file)
--- a/contrib/README.txt
+++ b/contrib/README.txt
@@ -17,7 +17,6 @@ Available libraries:
 - cocoa-callbacks -- Allows you to use Factor quotations as actions (Slava Pestov)
 - concurrency -- Erlang/Termite-style distibuted concurrency (Chris Double)
 - coroutines -- coroutines (Chris Double)
-- cpuinfo -- Information about your system (Doug Coleman)
 - crypto -- Various cryptographic algorithms (Doug Coleman)
 - dlists -- double-linked-lists (Mackenzie Straight)
 - emacs -- emacs integration (Eduardo Cavazos)
@@ -25,6 +24,7 @@ Available libraries:
 - furnace -- Web framework (Slava Pestov)
 - furnace-pastebin -- demo app for Furnace (Slava Pestov)
 - gap-buffer -- Efficient text editor buffer (Alex Chapman)
+- hardware-info -- Information about your computer (Doug Coleman)
 - hexdump -- Hexdump routine (Doug Coleman)
 - http -- Code shared by HTTP server and client (Slava Pestov)
 - httpd -- HTTP server (Slava Pestov, Chris Double)

diff --git a/contrib/all.factor b/contrib/all.factor
index 6e73bfee889bc8c21437b6174d6944cf150f688d..67fb941fec33d82fda0d58378dc9375c5ac0ed70 100644 (file)
--- a/contrib/all.factor
+++ b/contrib/all.factor
@@ -2,10 +2,11 @@ USING: kernel modules words ;
 
 REQUIRES: contrib/alien contrib/automata contrib/base64
 contrib/benchmarks contrib/boids contrib/cairo contrib/calendar
-contrib/concurrency contrib/coroutines contrib/cpuinfo
-contrib/crypto contrib/dlists contrib/emacs contrib/furnace
-contrib/furnace-pastebin contrib/gap-buffer contrib/hexdump
-contrib/http contrib/httpd contrib/http-client contrib/jedit
+contrib/concurrency contrib/coroutines contrib/crypto
+contrib/dlists contrib/emacs contrib/furnace
+contrib/furnace-pastebin contrib/gap-buffer 
+contrib/hardware-info contrib/hexdump contrib/http
+contrib/httpd contrib/http-client contrib/jedit
 contrib/jni contrib/json contrib/lambda contrib/lazy-lists
 contrib/lindenmayer contrib/match contrib/math
 contrib/parser-combinators contrib/postgresql contrib/process

diff --git a/contrib/cpuinfo/cpuinfo.factor b/contrib/cpuinfo/cpuinfo.factor
deleted file mode 100644 (file)
index 360a86c..0000000
--- a/contrib/cpuinfo/cpuinfo.factor
+++ /dev/null
@@ -1,5 +0,0 @@
-IN: cpuinfo
-USING: kernel math ;
-
-: >megs ( m -- n )
-       -20 shift ;

diff --git a/contrib/cpuinfo/load.factor b/contrib/cpuinfo/load.factor
deleted file mode 100644 (file)
index 200ca8b..0000000
--- a/contrib/cpuinfo/load.factor
+++ /dev/null
@@ -1,12 +0,0 @@
-! See http://factorcode.org/license.txt for BSD license.
-USING: kernel ;
-
-PROVIDE: contrib/cpuinfo
-{ +files+ {
-    { "os-windows.factor" [ windows? ] }
-    { "os-unix.factor" [ unix? ] }
-    "cpuinfo.factor"
-} }
-{ +tests+ {
-} } ;
-

diff --git a/contrib/cpuinfo/os-unix.factor b/contrib/cpuinfo/os-unix.factor
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/contrib/cpuinfo/os-windows.factor b/contrib/cpuinfo/os-windows.factor
deleted file mode 100644 (file)
index a58c0cc..0000000
--- a/contrib/cpuinfo/os-windows.factor
+++ /dev/null
@@ -1,54 +0,0 @@
-IN: cpuinfo
-USING: alien kernel math win32-api ;
-
-: memory-status ( -- MEMORYSTATUSEX )
-    "MEMORYSTATUSEX" <c-object>
-    "MEMORYSTATUSEX" c-size over set-MEMORYSTATUSEX-dwLength
-    [ GlobalMemoryStatusEx ] keep swap zero? [ win32-error ] when ;
-
-: physical-ram ( -- n )
-    memory-status MEMORYSTATUSEX-ullTotalPhys ;
-
-: available-ram ( -- n )
-    memory-status MEMORYSTATUSEX-ullAvailPhys ;
-
-: system-info ( -- SYSTEM_INFO )
-    "SYSTEM_INFO" <c-object> [ GetSystemInfo ] keep ;
-
-: page-size ( -- n )
-    system-info SYSTEM_INFO-dwPageSize ;
-
-: processor# ( -- n )
-    system-info SYSTEM_INFO-dwNumberOfProcessors ;
-
-! 386, 486, 586, 2200 (IA64), 8664 (AMD_X8664)
-: processor-type ( -- n )
-    system-info SYSTEM_INFO-dwProcessorType ;
-
-! 0 = x86, 6 = Intel Itanium, 9 = x64 (AMD or Intel), 10 = WOW64, 0xffff = Unk
-: processor-architecture ( -- n )
-    system-info SYSTEM_INFO-dwOemId HEX: ffff0000 bitand ;
-
-: os-version
-    "OSVERSIONINFO" <c-object>
-    "OSVERSIONINFO" c-size over set-OSVERSIONINFO-dwOSVersionInfoSize
-    [ GetVersionEx ] keep swap zero? [ win32-error ] when ;
-
-: windows-major ( -- n )
-    os-version OSVERSIONINFO-dwMajorVersion ;
-
-: windows-minor ( -- n )
-    os-version OSVERSIONINFO-dwMinorVersion ;
-
-: windows-build# ( -- n )
-    os-version OSVERSIONINFO-dwBuildNumber ;
-
-: windows-platform-id ( -- n )
-    os-version OSVERSIONINFO-dwPlatformId ;
-
-: windows-service-pack ( -- string )
-    os-version OSVERSIONINFO-szCSDVersion ;
-
-: sse2? ( -- ? )
-    PF_XMMI64_INSTRUCTIONS_AVAILABLE IsProcessorFeaturePresent zero? not ;
-

diff --git a/contrib/hardware-info/cpuinfo.factor b/contrib/hardware-info/cpuinfo.factor
new file mode 100644 (file)
index 0000000..360a86c
--- /dev/null
+++ b/contrib/hardware-info/cpuinfo.factor
@@ -0,0 +1,5 @@
+IN: cpuinfo
+USING: kernel math ;
+
+: >megs ( m -- n )
+       -20 shift ;

diff --git a/contrib/hardware-info/load.factor b/contrib/hardware-info/load.factor
new file mode 100644 (file)
index 0000000..200ca8b
--- /dev/null
+++ b/contrib/hardware-info/load.factor
@@ -0,0 +1,12 @@
+! See http://factorcode.org/license.txt for BSD license.
+USING: kernel ;
+
+PROVIDE: contrib/cpuinfo
+{ +files+ {
+    { "os-windows.factor" [ windows? ] }
+    { "os-unix.factor" [ unix? ] }
+    "cpuinfo.factor"
+} }
+{ +tests+ {
+} } ;
+

diff --git a/contrib/hardware-info/os-unix.factor b/contrib/hardware-info/os-unix.factor
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/contrib/hardware-info/os-windows.factor b/contrib/hardware-info/os-windows.factor
new file mode 100644 (file)
index 0000000..a58c0cc
--- /dev/null
+++ b/contrib/hardware-info/os-windows.factor
@@ -0,0 +1,54 @@
+IN: cpuinfo
+USING: alien kernel math win32-api ;
+
+: memory-status ( -- MEMORYSTATUSEX )
+    "MEMORYSTATUSEX" <c-object>
+    "MEMORYSTATUSEX" c-size over set-MEMORYSTATUSEX-dwLength
+    [ GlobalMemoryStatusEx ] keep swap zero? [ win32-error ] when ;
+
+: physical-ram ( -- n )
+    memory-status MEMORYSTATUSEX-ullTotalPhys ;
+
+: available-ram ( -- n )
+    memory-status MEMORYSTATUSEX-ullAvailPhys ;
+
+: system-info ( -- SYSTEM_INFO )
+    "SYSTEM_INFO" <c-object> [ GetSystemInfo ] keep ;
+
+: page-size ( -- n )
+    system-info SYSTEM_INFO-dwPageSize ;
+
+: processor# ( -- n )
+    system-info SYSTEM_INFO-dwNumberOfProcessors ;
+
+! 386, 486, 586, 2200 (IA64), 8664 (AMD_X8664)
+: processor-type ( -- n )
+    system-info SYSTEM_INFO-dwProcessorType ;
+
+! 0 = x86, 6 = Intel Itanium, 9 = x64 (AMD or Intel), 10 = WOW64, 0xffff = Unk
+: processor-architecture ( -- n )
+    system-info SYSTEM_INFO-dwOemId HEX: ffff0000 bitand ;
+
+: os-version
+    "OSVERSIONINFO" <c-object>
+    "OSVERSIONINFO" c-size over set-OSVERSIONINFO-dwOSVersionInfoSize
+    [ GetVersionEx ] keep swap zero? [ win32-error ] when ;
+
+: windows-major ( -- n )
+    os-version OSVERSIONINFO-dwMajorVersion ;
+
+: windows-minor ( -- n )
+    os-version OSVERSIONINFO-dwMinorVersion ;
+
+: windows-build# ( -- n )
+    os-version OSVERSIONINFO-dwBuildNumber ;
+
+: windows-platform-id ( -- n )
+    os-version OSVERSIONINFO-dwPlatformId ;
+
+: windows-service-pack ( -- string )
+    os-version OSVERSIONINFO-szCSDVersion ;
+
+: sse2? ( -- ? )
+    PF_XMMI64_INSTRUCTIONS_AVAILABLE IsProcessorFeaturePresent zero? not ;
+