bugfix: fixed memory leaks in osproc module

lib/pure/osproc.nim

@@ -224,14 +224,6 @@ when not defined(useNimRtl):
     close(outp)
     close(p)
 
-when false:
-  proc deallocCStringArray(a: cstringArray) =
-    var i = 0
-    while a[i] != nil:
-      dealloc(a[i])
-      inc(i)
-    dealloc(a)
-
 when defined(Windows) and not defined(useNimRtl):
   # We need to implement a handle stream for Windows:
   type
@@ -491,6 +483,13 @@ elif not defined(useNimRtl):
       copyMem(result[i], addr(x[0]), x.len+1)
       inc(i)
 
+  proc deallocCStringArray(a: cstringArray) =
+    var i = 0
+    while a[i] != nil:
+      dealloc(a[i])
+      inc(i)
+    dealloc(a)
+    
   proc startProcess(command: string,
                  workingDir: string = "",
                  args: openarray[string] = [],
@@ -537,18 +536,21 @@ elif not defined(useNimRtl):
           chck posix_spawn_file_actions_adddup2(fops, p_stderr[writeIdx], 2)
       
       var e = if env == nil: EnvToCStringArray() else: ToCStringArray(env)
-      
+      var a: cstringArray
+      var res: cint
       if workingDir.len > 0: os.setCurrentDir(workingDir)
       if poUseShell notin options:
-        var a = toCStringArray([extractFilename(command)], args)
+        a = toCStringArray([extractFilename(command)], args)
-        chck posix_spawn(pid, command, fops, attr, a, e)
+        res = posix_spawn(pid, command, fops, attr, a, e)
       else:
         var x = addCmdArgs(command, args)
-        var a = toCStringArray(["sh", "-c"], [x])
+        a = toCStringArray(["sh", "-c"], [x])
-        chck posix_spawn(pid, "/bin/sh", fops, attr, a, e)
+        res = posix_spawn(pid, "/bin/sh", fops, attr, a, e)
-
+      deallocCStringArray(a)
-      chck posix_spawn_file_actions_destroy(fops)
+      deallocCStringArray(e)
-      chck posix_spawnattr_destroy(attr)
+      discard posix_spawn_file_actions_destroy(fops)
+      discard posix_spawnattr_destroy(attr)
+      chck res
 
     else:
     

lib/system.nim

@@ -1774,10 +1774,10 @@ when not defined(EcmaScript) and not defined(NimrodVM):
 
   # ----------------------------------------------------------------------------
 
-  proc atomicInc*(memLoc: var int, x: int = 1): int {.inline.}
+  proc atomicInc*(memLoc: var int, x: int = 1): int {.inline, discardable.}
     ## atomic increment of `memLoc`. Returns the value after the operation.
   
-  proc atomicDec*(memLoc: var int, x: int = 1): int {.inline.}
+  proc atomicDec*(memLoc: var int, x: int = 1): int {.inline, discardable.}
     ## atomic decrement of `memLoc`. Returns the value after the operation.
 
   include "system/atomics"

tests/specials.nim

@@ -0,0 +1,138 @@
+#
+#
+#            Nimrod Tester
+#        (c) Copyright 2011 Andreas Rumpf
+#
+#    See the file "copying.txt", included in this
+#    distribution, for details about the copyright.
+#
+
+## Include for the tester that contains test suites that test special features
+## of the compiler.
+
+# ---------------- ROD file tests ---------------------------------------------
+
+const
+  rodfilesDir = "tests/rodfiles"
+
+proc delNimCache() = removeDir(rodfilesDir / "nimcache")
+proc plusCache(options: string): string = return options & " --symbolFiles:on"
+
+proc runRodFiles(r: var TResults, options: string) =
+  template test(filename: expr): stmt =
+    runSingleTest(r, rodfilesDir / filename, options)
+  
+  var options = options.plusCache
+  delNimCache()
+  
+  # test basic recompilation scheme:
+  test "hallo"
+  test "hallo"
+  # test incremental type information:
+  test "hallo2"
+  delNimCache()
+  
+  # test type converters:
+  test "aconv"
+  test "bconv"
+  delNimCache()
+  
+  # test G, A, B example from the documentation; test init sections:
+  test "deada"
+  test "deada2"
+  delNimCache()
+  
+  # test method generation:
+  test "bmethods"
+  test "bmethods2"
+  delNimCache()
+  
+  # test generics:
+  test "tgeneric1"
+  test "tgeneric2"
+  delNimCache()
+
+proc compileRodFiles(r: var TResults, options: string) =
+  template test(filename: expr): stmt =
+    compileSingleTest(r, rodfilesDir / filename, options)
+    
+  var options = options.plusCache
+  delNimCache()
+  # test DLL interfacing:
+  test "gtkex1"
+  test "gtkex2"
+  delNimCache()
+
+# --------------------- DLL generation tests ----------------------------------
+
+proc runBasicDLLTest(c, r: var TResults, options: string) =
+  compileSingleTest c, "lib/nimrtl.nim", options & " --app:lib -d:createNimRtl"
+  compileSingleTest c, "tests/dll/server.nim", 
+    options & " --app:lib -d:useNimRtl"
+  
+  when defined(Windows): 
+    # windows looks in the dir of the exe (yay!):
+    var nimrtlDll = DynlibFormat % "nimrtl"
+    copyFile("lib" / nimrtlDll, "tests/dll" / nimrtlDll)
+  else:
+    # posix relies on crappy LD_LIBRARY_PATH (ugh!):
+    var libpath = getenv"LD_LIBRARY_PATH".string
+    if peg"\i '/nimrod' (!'/')* '/lib'" notin libpath:
+      echo "[Warning] insufficient LD_LIBRARY_PATH"
+    var serverDll = DynlibFormat % "server"
+    copyFile("tests/dll" / serverDll, "lib" / serverDll)
+  
+  runSingleTest r, "tests/dll/client.nim", options & " -d:useNimRtl"
+
+proc runDLLTests(r: var TResults, options: string) =
+  # dummy compile result:
+  var c = initResults()
+  
+  runBasicDLLTest c, r, options
+  runBasicDLLTest c, r, options & " -d:release"
+  runBasicDLLTest c, r, options & " --gc:boehm"
+  runBasicDLLTest c, r, options & " -d:release --gc:boehm"
+  
+# ------------------------------ GC tests -------------------------------------
+
+proc runGcTests(r: var TResults, options: string) =
+  template test(filename: expr): stmt =
+    runSingleTest(r, "tests/gc" / filename, options)
+    runSingleTest(r, "tests/gc" / filename, options & " -d:release")
+  
+  test "gcbench"
+  test "gcleak"
+  test "gcleak2"
+  test "gctest"
+  # disabled for now as it somehow runs very slowly ('delete' bug?) but works:
+  test "gcleak3"
+  
+
+# ------------------------- threading tests -----------------------------------
+
+proc runThreadTests(r: var TResults, options: string) =
+  template test(filename: expr): stmt =
+    runSingleTest(r, "tests/threads" / filename, options)
+    runSingleTest(r, "tests/threads" / filename, options & " -d:release")
+    runSingleTest(r, "tests/threads" / filename, options & " -tlsEmulation:on")
+  
+  test "tactors"
+  #test "threadex"
+  #test "threadring"
+  #test "tthreadanalysis"
+  #test "tthreadanalysis2"
+  #test "tthreadsort"
+
+# ------------------------- register special tests here -----------------------
+proc runSpecialTests(r: var TResults, options: string) =
+  runRodFiles(r, options)
+  runDLLTests(r, options)
+  runGCTests(r, options)
+  runThreadTests(r, options & " --threads:on")
+
+proc rejectSpecialTests(r: var TResults, options: string) =
+  
+
+proc compileSpecialTests(r: var TResults, options: string) =
+  nil
+

tests/tester.nim

@@ -18,7 +18,7 @@ const
   resultsFile = "testresults.html"
   jsonFile = "testresults.json"
   Usage = "usage: tester reject|compile|examples|run|merge [nimrod options]\n" &
-          "   or: tester test singleTest"
+          "   or: tester test|comp|rej singleTest"
 
 type
   TTestAction = enum
@@ -104,7 +104,8 @@ proc parseSpec(filename: string): TSpec =
 # ----------------------------------------------------------------------------
 
 var
-  pegLineError = peg"{[^(]*} '(' {\d+} ', ' \d+ ') Error:' \s* {.*}"
+  pegLineError = 
+    peg"{[^(]*} '(' {\d+} ', ' \d+ ') ' ('Error'/'Warning') ':' \s* {.*}"
   pegOtherError = peg"'Error:' \s* {.*}"
   pegSuccess = peg"'Hint: operation successful'.*"
   pegOfInterest = pegLineError / pegOtherError / pegSuccess
@@ -118,7 +119,7 @@ proc callCompiler(cmdTemplate, filename, options: string): TSpec =
   while running(p) or not atEnd(outp):
     var x = outp.readLine().string
     if x =~ pegOfInterest:
-      # `s` should contain the last error message
+      # `s` should contain the last error/warning message
       s = x
   close(p)
   result.msg = ""
@@ -290,104 +291,7 @@ proc runSingleTest(r: var TResults, test, options: string) =
 proc run(r: var TResults, dir, options: string) =
   for test in os.walkFiles(dir / "t*.nim"): runSingleTest(r, test, options)
 
-# ---------------- ROD file tests ---------------------------------------------
+include specials
-
-const
-  rodfilesDir = "tests/rodfiles"
-
-proc delNimCache() = removeDir(rodfilesDir / "nimcache")
-proc plusCache(options: string): string = return options & " --symbolFiles:on"
-
-proc runRodFiles(r: var TResults, options: string) =
-  template test(filename: expr): stmt =
-    runSingleTest(r, rodfilesDir / filename, options)
-  
-  var options = options.plusCache
-  delNimCache()
-  
-  # test basic recompilation scheme:
-  test "hallo"
-  test "hallo"
-  # test incremental type information:
-  test "hallo2"
-  delNimCache()
-  
-  # test type converters:
-  test "aconv"
-  test "bconv"
-  delNimCache()
-  
-  # test G, A, B example from the documentation; test init sections:
-  test "deada"
-  test "deada2"
-  delNimCache()
-  
-  # test method generation:
-  test "bmethods"
-  test "bmethods2"
-  delNimCache()
-  
-  # test generics:
-  test "tgeneric1"
-  test "tgeneric2"
-  delNimCache()
-
-proc compileRodFiles(r: var TResults, options: string) =
-  template test(filename: expr): stmt =
-    compileSingleTest(r, rodfilesDir / filename, options)
-    
-  var options = options.plusCache
-  delNimCache()
-  # test DLL interfacing:
-  test "gtkex1"
-  test "gtkex2"
-  delNimCache()
-
-# --------------------- DLL generation tests ----------------------------------
-
-proc runBasicDLLTest(c, r: var TResults, options: string) =
-  compileSingleTest c, "lib/nimrtl.nim", options & " --app:lib -d:createNimRtl"
-  compileSingleTest c, "tests/dll/server.nim", 
-    options & " --app:lib -d:useNimRtl"
-  
-  when defined(Windows): 
-    # windows looks in the dir of the exe (yay!):
-    var nimrtlDll = DynlibFormat % "nimrtl"
-    copyFile("lib" / nimrtlDll, "tests/dll" / nimrtlDll)
-  else:
-    # posix relies on crappy LD_LIBRARY_PATH (ugh!):
-    var libpath = getenv"LD_LIBRARY_PATH".string
-    if peg"\i '/nimrod' (!'/')* '/lib'" notin libpath:
-      echo "[Warning] insufficient LD_LIBRARY_PATH"
-    var serverDll = DynlibFormat % "server"
-    copyFile("tests/dll" / serverDll, "lib" / serverDll)
-  
-  runSingleTest r, "tests/dll/client.nim", options & " -d:useNimRtl"
-
-proc runDLLTests(r: var TResults, options: string) =
-  # dummy compile result:
-  var c = initResults()
-  
-  runBasicDLLTest c, r, options
-  runBasicDLLTest c, r, options & " -d:release"
-  runBasicDLLTest c, r, options & " --gc:boehm"
-  runBasicDLLTest c, r, options & " -d:release --gc:boehm"
-  
-# ------------------------------ GC tests -------------------------------------
-
-proc runGcTests(r: var TResults, options: string) =
-  template test(filename: expr): stmt =
-    runSingleTest(r, "tests/gc" / filename, options)
-    runSingleTest(r, "tests/gc" / filename, options & " -d:release")
-  
-  test "gcbench"
-  test "gcleak"
-  test "gcleak2"
-  test "gctest"
-  # disabled for now as it somehow runs very slowly ('delete' bug?) but works:
-  test "gcleak3"
-  
-# -----------------------------------------------------------------------------
    
 proc compileExample(r: var TResults, pattern, options: string) =
   for test in os.walkFiles(pattern): compileSingleTest(r, test, options)
@@ -440,9 +344,7 @@ proc main() =
   of "run":
     var runRes = initResults()
     run(runRes, "tests/accept/run", p.cmdLineRest.string)
-    runRodFiles(runRes, p.cmdLineRest.string)
+    runSpecialTests(runRes, p.cmdLineRest.string)
-    runDLLTests(runRes, p.cmdLineRest.string)
-    runGCTests(runRes, p.cmdLineRest.string)
     writeResults(runJson, runRes)
   of "merge":
     var rejectRes = readResults(rejectJson)
@@ -458,14 +360,14 @@ proc main() =
     var r = initResults()
     runGCTests(r, p.cmdLineRest.string)
     echo r.data, r
-  of "test":
+  of "test", "comp", "rej":
     var r = initResults()
     if p.kind != cmdArgument: quit usage
     var testFile = p.key.string
     p.next()
-    if peg"'/reject/'" in testFile:
+    if peg"'/reject/'" in testFile or action == "rej":
       rejectSingleTest(r, testFile, p.cmdLineRest.string)
-    elif peg"'/compile/'" in testFile:
+    elif peg"'/compile/'" in testFile or action == "comp":
       compileSingleTest(r, testFile, p.cmdLineRest.string)
     else:
       runSingleTest(r, testFile, p.cmdLineRest.string)

tests/threads/tactors.nim

@@ -0,0 +1,13 @@
+discard """
+  outputsub: "150"
+"""
+
+import actors
+
+var
+  a: TActorPool[int, void]
+createActorPool(a)
+for i in 0 .. < 300:
+  a.spawn(i, proc (x: int) {.thread.} = echo x)
+a.join()
+

tests/threads/threadex.nim

@@ -1,3 +1,6 @@
+discard """
+  output: ""
+"""
 
 type
   TMsgKind = enum
@@ -18,7 +21,7 @@ proc consume() {.thread.} =
       x.backTo.send(printedLines)
       break
     echo x.data
-    discard atomicInc(printedLines)
+    atomicInc(printedLines)
 
 proc produce() =
   var m: TMsg

tests/threads/tthreadanalysis2.nim

@@ -1,6 +1,6 @@
 discard """
   file: "tthreadanalysis2.nim"
-  line: 45
+  line: 42
   errormsg: "write to foreign heap"
   cmd: "nimrod cc --hints:on --threads:on $# $#"
 """