Fix memory leak

PerlGameDev · Mar 6, 2011 · 0175469 · 0175469
1 parent 8f36d4f
commit 0175469
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 34 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,7 @@
 Revision history for Perl extension SDL_perl.
 
 *
+    - SDLx::Controller::Interface  fixed memory leak [jtpalmer]
     - SDLx::Controller::Interface  fixed angular velocity [jtpalmer]
 
 * 2.531 Feb 27 2011

diff --git a/src/SDLx/Controller/Interface.xs b/src/SDLx/Controller/Interface.xs
@@ -3,6 +3,7 @@
 #include "XSUB.h"
 #include "ppport.h"
 #include "defines.h"
+#include "helper.h"
 
 #ifndef aTHX_
 #define aTHX_
@@ -13,49 +14,37 @@
 
 AV* acceleration_cb( SDLx_Interface * obj, float t )
 {
-
 	SV* tmpsv;
 	if( !(SvROK(obj->acceleration) && (tmpsv = obj->acceleration) ) )
 	{
 		croak( "Interface doesn't not contain an acceleration callback" );
 	}
 
-
 	dSP;
 	AV* array = newAV();
+	int i;
 	int count;
-	SV * stateref = newSV( sizeof(SDLx_State *) ); 	
+	SDLx_State* copyState = (SDLx_State *)safemalloc( sizeof(SDLx_State) );
-	void * copyState = safemalloc( sizeof(SDLx_State) );
+	copy_state( copyState, obj->current );
-	memcpy( copyState, obj->current, sizeof(SDLx_State) );
+	copyState->owned = 0;
-	((SDLx_State *)copyState)->owned = 0; /*conditional free */
 	ENTER;
 	SAVETMPS;
 	PUSHMARK(SP);
-
+	XPUSHs( sv_2mortal(newSVnv(t)) );
-	void** pointers  = safemalloc(3 * sizeof(void*));
+	XPUSHs( sv_2mortal( obj2bag( sizeof(SDLx_State *), (void *)copyState, "SDLx::Controller::State" ) ) );
-	pointers[0]      = (void*)copyState;
-	pointers[1]      = (void*)0;
-	Uint32 *threadid = (Uint32 *)safemalloc(sizeof(Uint32));
-	*threadid        = SDL_ThreadID();
-	pointers[2]      = (void*)threadid;
-	SV * state_obj   = sv_setref_pv( stateref, "SDLx::Controller::State", (void *)pointers);
-
-	XPUSHs( sv_2mortal(newSVnv(t)));
-	XPUSHs( state_obj  );
-
 	PUTBACK;
 
-	count = call_sv(obj->acceleration, G_ARRAY);
+	count = call_sv( obj->acceleration, G_ARRAY );
 
 	SPAGAIN;
 /*	warn( "state %p, state->x %f", copyState, ((SDLx_State *)copyState)->x ); */
-	int i;
+	for( i = 0; i < count; i++ )
-	for( i =0; i < count ; i++)
+		av_push( array, newSVnv(POPn) );
-	 av_push( array, newSVnv(POPn));
 
 /*	warn ("before obj->current->x %f", obj->current->x); */
-	copy_state(obj->current, (SDLx_State *)copyState);
+	copy_state( obj->current, copyState );
 /*	warn ("after obj->current->x %f", obj->current->x); */
+	PUTBACK;
 	FREETMPS;
 	LEAVE;
 
@@ -68,10 +57,21 @@ void evaluate(SDLx_Interface* obj, SDLx_Derivative* out, SDLx_State* initial, fl
 	out->dy = initial->v_y;
 	out->drotation = initial->ang_v;
 	AV* accel = acceleration_cb(obj, t);
-	out->dv_x = sv_nv(av_pop(accel));
-	out->dv_y = sv_nv(av_pop(accel));
-	out->dang_v = sv_nv(av_pop(accel));
 
+	SV* temp;
+	temp = av_pop(accel);
+	out->dv_x = sv_nv(temp);
+	SvREFCNT_dec(temp);
+
+	temp = av_pop(accel);
+	out->dv_y = sv_nv(temp);
+	SvREFCNT_dec(temp);
+
+	temp = av_pop(accel);
+	out->dang_v = sv_nv(temp);
+	SvREFCNT_dec(temp);
+
+	SvREFCNT_dec((SV*)accel);
 }
 
 void evaluate_dt(SDLx_Interface* obj, SDLx_Derivative* out, SDLx_State* initial, float t, float dt, SDLx_Derivative* d)
@@ -90,9 +90,21 @@ void evaluate_dt(SDLx_Interface* obj, SDLx_Derivative* out, SDLx_State* initial,
 	out->drotation = state.ang_v;
 
 	AV* accel = acceleration_cb(obj, t+dt);
-	out->dv_x = sv_nv(av_pop(accel));
+
-	out->dv_y = sv_nv(av_pop(accel));
+	SV* temp;
-	out->dang_v = sv_nv(av_pop(accel));
+	temp = av_pop(accel);
+	out->dv_x = sv_nv(temp);
+	SvREFCNT_dec(temp);
+
+	temp = av_pop(accel);
+	out->dv_y = sv_nv(temp);
+	SvREFCNT_dec(temp);
+
+	temp = av_pop(accel);
+	out->dang_v = sv_nv(temp);
+	SvREFCNT_dec(temp);
+
+	SvREFCNT_dec((SV*)accel);
 }
 
 void integrate( SDLx_Interface* object, float t, float dt) 

diff --git a/src/SDLx/Controller/State.xs b/src/SDLx/Controller/State.xs
@@ -3,6 +3,7 @@
 #include "XSUB.h"
 #include "ppport.h"
 #include "defines.h"
+#include "helper.h"
 
 #ifndef aTHX_
 #define aTHX_
@@ -88,10 +89,11 @@ state_ang_v(state, ...)
 		RETVAL
 
 void
-state_DESTROY( obj )
+state_DESTROY( bag )
-	SDLx_State *obj
+	SV *bag
-	CODE: 
+	CODE:
-	  if (obj->owned == 0)
+		SDLx_State *obj = (SDLx_State *)bag2obj(bag);
-	   safefree(obj);	
+		if (obj->owned == 0)
+			objDESTROY(bag, safefree);