eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-20 23:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix shared resource cleanup

Browse Source
This commit is contained in:
niels
2015-01-10 15:34:47 +01:00
parent ab83369796
commit cdbaeef46b
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
veejay-current/veejay-server/veejay/vj-shm.c
View File

@@ -47,7 +47,7 @@
typedef struct { typedef struct {
int shm_id; int shm_id;
char *sms; void *sms;
char *env_shm_id; char *env_shm_id;
int parent; int parent;
key_t key; key_t key;
@@ -91,10 +91,6 @@ void vj_shm_free(void *vv)
int res = pthread_rwlock_destroy( &data->rwlock ); int res = pthread_rwlock_destroy( &data->rwlock );
res = shmdt( v->sms );
if(res==-1 ) {
veejay_msg(VEEJAY_MSG_DEBUG, "Failed to detach shared memory: %s",strerror(errno));
}
res = shmctl( v->shm_id, IPC_RMID, NULL ); res = shmctl( v->shm_id, IPC_RMID, NULL );
if( res==-1 ) { if( res==-1 ) {
veejay_msg(0, "Failed to remove shared memory %d: %s", v->shm_id, strerror(errno)); veejay_msg(0, "Failed to remove shared memory %d: %s", v->shm_id, strerror(errno));
@@ -136,10 +132,7 @@ int vj_shm_stop( void *vv )
{ {
vj_shm_t *v = (vj_shm_t*) vv; vj_shm_t *v = (vj_shm_t*) vv;
vj_shared_data *data = (vj_shared_data*) v->sms; int res = shmdt(v->sms);
int res = shmdt( data );
if( res ) { if( res ) {
veejay_msg(0,"failed to detach shared memory: %s",strerror(errno)); veejay_msg(0,"failed to detach shared memory: %s",strerror(errno));
return -1; return -1;
@@ -166,7 +159,7 @@ int vj_shm_read( void *vv , uint8_t *dst[3] )
// veejay_msg(0, "%s",strerror(errno)); // veejay_msg(0, "%s",strerror(errno));
return -1; return -1;
} }
uint8_t *ptr = v->sms + HEADER_LENGTH; uint8_t *ptr = ( (uint8_t*) v->sms ) + HEADER_LENGTH;
int len = data->header[0] * data->header[1]; //@ int len = data->header[0] * data->header[1]; //@
int uv_len = len / 2; int uv_len = len / 2;
@@ -206,7 +199,7 @@ int vj_shm_write( void *vv, uint8_t *frame[3], int plane_sizes[4] )
return -1; return -1;
} }
uint8_t *ptr = (uint8_t*) v->sms + HEADER_LENGTH; uint8_t *ptr = ( (uint8_t*) v->sms) + HEADER_LENGTH;
uint8_t *dst[4] = { ptr, ptr + plane_sizes[0], ptr + plane_sizes[0] + plane_sizes[1], NULL }; uint8_t *dst[4] = { ptr, ptr + plane_sizes[0], ptr + plane_sizes[0] + plane_sizes[1], NULL };
plane_sizes[3] = 0; plane_sizes[3] = 0;
@@ -348,7 +341,6 @@ void *vj_shm_new_master( const char *homedir, VJFrame *frame)
} }
long size = (frame->width * frame->height * 4); long size = (frame->width * frame->height * 4);
long offset = HEADER_LENGTH;
//@ create //@ create
v->shm_id = shmget( v->key,size, IPC_CREAT |0666 ); v->shm_id = shmget( v->key,size, IPC_CREAT |0666 );
@@ -360,7 +352,7 @@ void *vj_shm_new_master( const char *homedir, VJFrame *frame)
} }
//@ attach //@ attach
v->sms = shmat( v->shm_id, NULL , 0 ); v->sms = shmat( v->shm_id, NULL , 0 );
if( v->sms == NULL || v->sms == (char*) (-1) ) { if( v->sms == NULL || v->sms == (char*) (-1) ) {
shmctl( v->shm_id, IPC_RMID, NULL ); shmctl( v->shm_id, IPC_RMID, NULL );
veejay_msg(0, "Failed to attach to shared memory:%s",strerror(errno)); veejay_msg(0, "Failed to attach to shared memory:%s",strerror(errno));
@@ -379,7 +371,9 @@ void *vj_shm_new_master( const char *homedir, VJFrame *frame)
veejay_memset( V, 128, (frame->width*frame->height)/2); veejay_memset( V, 128, (frame->width*frame->height)/2);
//@ set up frame info (fixme, incomplete) //@ set up frame info (fixme, incomplete)
vj_shared_data *data = (vj_shared_data*) &(v->sms[0]); // vj_shared_data *data = (vj_shared_data*) &(v->sms[0]);
vj_shared_data *data = (vj_shared_data*) v->sms;
data->resource_id = v->shm_id; data->resource_id = v->shm_id;
data->header[0] = frame->width; data->header[0] = frame->width;
data->header[1] = frame->height; data->header[1] = frame->height;