expose freeProblem outside finaliser

jump-dev · Oct 19, 2014 · 2dd22dd · 2dd22dd
1 parent e430f16
commit 2dd22dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/examples/hs015_tuner.jl b/examples/hs015_tuner.jl
@@ -86,3 +86,5 @@ solveProblem(kp)
 @test_approx_eq_eps kp.x[1] 0.5 1e-4
 @test_approx_eq_eps kp.x[2] 2.0 1e-4
 @test_approx_eq_eps kp.obj_val[1] 306.5 0.02
+
+freeProblem(kp)
diff --git a/src/KNITRO.jl b/src/KNITRO.jl
@@ -13,7 +13,7 @@ module KNITRO
 
     export
         KnitroProblem,
-        createProblem, #freeProblem,
+        createProblem, freeProblem,
         initializeProblem,
         solveProblem,
         restartProblem,
@@ -57,17 +57,21 @@ module KNITRO
         function KnitroProblem()
             prob = new(newcontext())
             # finalizer segfaults upon termination of the running script
-            finalizer(prob, freeProblem)
+            # finalizer(prob, freeProblem)
             prob
         end
     end
 
     createProblem() = KnitroProblem()
 
     function freeProblem(kp::KnitroProblem)
-        println("KNITRO.jl: freeing problem")
-        freecontext(kp.env)
-        println("KNITRO.jl: problem freed")
+        println("KNITRO: calling freecontext on $(kp.env)")
+        println("C_NULL (for reference): $(C_NULL)")
+        return_code = @ktr_ccall(free, Int32, (Ptr{Void},), pointer_from_objref(kp.env))
+        if return_code != 0
+            error("KNITRO: Error freeing memory")
+        end
+        println("KNITRO: freecontext successful")
         kp.env = C_NULL
         println("KNITRO.jl: set env to C_NULL")
     end