[MLton-commit] r4552

[Matthew F. <fl...@ml...>]

Catch up with signature changes
----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs/mlton.sml
U   mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs/rlimit.sig

----------------------------------------------------------------------

Modified: mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs/mlton.sml
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs/mlton.sml	2006-05-20 00:28:28 UTC (rev 4551)
+++ mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs/mlton.sml	2006-05-20 00:33:51 UTC (rev 4552)
@@ -389,23 +389,31 @@
 
       structure Rlimit =
          struct
-            type rlim = Word.word
+            structure RLim =
+               struct
+                  type t = SysWord.word
+                  val castFromSysWord = fn w => w
+                  val castToSysWord = fn w => w
+               end
 
             val infinity: rlim = 0w0
 
             type t = int
                
+            val coreFileSize: t = 0
             val cpuTime: t = 0
-            val coreFileSize: t = 0
             val dataSize: t = 0
             val fileSize: t = 0
-            val lockedInMemorySize: t = 0
             val numFiles: t = 0
-            val numProcesses: t = 0
-            val residentSetSize: t = 0
             val stackSize: t = 0
             val virtualMemorySize: t = 0
 
+(* NOT STANDARD
+            val lockedInMemorySize: t = 0
+            val numProcesses: t = 0
+            val residentSetSize: t = 0
+*)
+
             fun get _ = raise Fail "Rlimit.get"
             fun set _ = raise Fail "Rlimit.set"
          end

Modified: mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs/rlimit.sig
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs/rlimit.sig	2006-05-20 00:28:28 UTC (rev 4551)
+++ mlton/branches/on-20050822-x86_64-branch/lib/mlton-stubs/rlimit.sig	2006-05-20 00:33:51 UTC (rev 4552)
@@ -6,13 +6,15 @@
  * See the file MLton-LICENSE for details.
  *)
 
-type word = Word.word
-   
 signature MLTON_RLIMIT =
    sig
-      type rlim = word
+      structure RLim : sig
+                          type t
+                          val castFromSysWord: SysWord.word -> t
+                          val castToSysWord: t -> SysWord.word
+                       end
                
-      val infinity: rlim
+      val infinity: RLim.t
 
       type t
                
@@ -20,13 +22,16 @@
       val cpuTime: t             (* CPU     CPU time in seconds *)
       val dataSize: t            (* DATA    max data size *)
       val fileSize: t            (* FSIZE   Maximum filesize *)
+      val numFiles: t            (* NOFILE  max number of open files *)  
+      val stackSize: t           (* STACK   max stack size *)
+      val virtualMemorySize: t   (* AS      virtual memory limit *)
+
+(* NOT STANDARD
       val lockedInMemorySize: t  (* MEMLOCK max locked address space *)
-      val numFiles: t            (* NOFILE  max number of open files *)  
       val numProcesses: t        (* NPROC   max number of processes *)
       val residentSetSize: t     (* RSS     max resident set size *)
-      val stackSize: t           (* STACK   max stack size *)
-      val virtualMemorySize: t   (* AS      virtual memory limit *)
-      
-      val get: t -> {hard: rlim, soft: rlim}
-      val set: t * {hard: rlim, soft: rlim} -> unit
+ *)
+
+      val get: t -> {hard: RLim.t, soft: RLim.t}
+      val set: t * {hard: RLim.t, soft: RLim.t} -> unit
    end