Skip to content

Commit

Permalink
Refactor all sem_*(image[imageIndex].semptr[semIndex]) calls to use I…
Browse files Browse the repository at this point in the history 
…mageStreamIO(image+imageIndex, semIndex...) interface calls
  • Loading branch information
@drbitboy @DasVinch
drbitboy authored and DasVinch committed Sep 20, 2023
1 parent 7f07325 commit 0c6c656
Show file tree
Hide file tree
Showing 21 changed files with 74 additions and 82 deletions.
4 changes: 2 additions & 2 deletions plugins/milk-extra-src/image_basic/streamfeed.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,10 @@ long IMAGE_BASIC_streamfeed(const char *__restrict IDname,
}
if(data.image[IDs].md[0].sem > 0)
{
sem_getvalue(data.image[IDs].semptr[0], &semval);
semval = ImageStreamIO_semvalue(data.image+IDs, 0);
if(semval < SEMAPHORE_MAXVAL)
{
sem_post(data.image[IDs].semptr[0]);
ImageStreamIO_sempost(data.image+IDs, 0);
}
}
data.image[IDs].md[0].write = 0;
Expand Down
4 changes: 2 additions & 2 deletions plugins/milk-extra-src/img_reduce/img_reduce.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ imageID IMG_REDUCE_cleanbadpix_fast(const char *IDname,
fflush(stdout);
if(data.image[ID].md[0].sem > 0)
{
sem_wait(data.image[ID].semptr[0]);
ImageStreamIO_semwait(data.image+ID, 0);
}
else
{
Expand Down Expand Up @@ -731,7 +731,7 @@ imageID IMG_REDUCE_cleanbadpix_fast(const char *IDname,
{
if(data.image[IDout].md[0].sem > 0)
{
sem_post(data.image[IDout].semptr[0]);
ImageStreamIO_sempost(data.image+IDout, 0);
}
}
data.image[IDout].md[0].write = 0;
Expand Down
2 changes: 1 addition & 1 deletion plugins/milk-extra-src/info/imagemon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ errno_t printstatus(imageID ID)
TUI_printfw("[%3ld sems ", image->md->sem);
for(int s = 0; s < image->md->sem; s++)
{
sem_getvalue(image->semptr[s], &semval);
semval = ImageStreamIO_semvalue(image, s);
TUI_printfw(" %6d ", semval);
}
TUI_printfw("]\n");
Expand Down
6 changes: 3 additions & 3 deletions plugins/milk-extra-src/info/streamtiming_stats.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@ errno_t info_image_streamtiming_stats(
// warmup
for(long cnt = 0; cnt < SEMAPHORE_MAXVAL; cnt++)
{
sem_trywait(image->semptr[sem]);
ImageStreamIO_semtrywait(image, sem);
}

clock_gettime(CLOCK_MILK, &tstart);
t0 = tstart;
t_timeout = t0;
t_timeout.tv_sec += 2;
sem_timedwait(image->semptr[sem], &t_timeout);
ImageStreamIO_semtimedwait(image, sem, &t_timeout);

while(loopOK == 1)
{
//for (long framecnt = 0; framecnt < NBsamplesmax; framecnt++)
if(sem_timedwait(image->semptr[sem], &t_timeout))
if(ImageStreamIO_semtimedwait(image, sem, &t_timeout))
{
return RETURN_FAILURE;
}
Expand Down
8 changes: 4 additions & 4 deletions plugins/milk-extra-src/linARfilterPred/linARfilterPred.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1292,7 +1292,7 @@ imageID LINARFILTERPRED_Build_LinPredictor(const char *IDin_name,
clock_gettime(CLOCK_MILK, &t0);
if(LOOPmode == 1)
{
sem_wait(data.image[IDin].semptr[semtrig]);
ImageStreamIO_semwait(data.image+IDin, semtrig);
}

/// *STEP: Copy IDin to IDincp*
Expand Down Expand Up @@ -1755,7 +1755,7 @@ imageID LINARFILTERPRED_Apply_LinPredictor_RT(const char *IDfilt_name,
abort();
}

while(sem_trywait(data.image[IDin].semptr[semtrig]) == 0)
while(ImageStreamIO_semtrywait(data.image+IDin, semtrig) == 0)
{
}
while(1)
Expand Down Expand Up @@ -1784,7 +1784,7 @@ imageID LINARFILTERPRED_Apply_LinPredictor_RT(const char *IDfilt_name,
inarray[kk * NBpix_in + ii];
}

sem_wait(data.image[IDin].semptr[semtrig]);
ImageStreamIO_semwait(data.image+IDin, semtrig);

// write new input in inarray vector
for(uint32_t ii = 0; ii < NBpix_in; ii++)
Expand Down Expand Up @@ -2280,7 +2280,7 @@ imageID LINARFILTERPRED_PF_RealTimeApply(const char *IDmodevalIN_name,
// printf("iter %5ld / %5ld", iter, NBiter);
// fflush(stdout);

sem_wait(data.image[IDmodevalIN].semptr[semtrig]);
ImageStreamIO_semwait(data.image+IDmodevalIN, semtrig);
// printf("\n");
// fflush(stdout);

Expand Down
14 changes: 7 additions & 7 deletions plugins/milk-extra-src/linalgebra/cublas_Coeff2Map_Loop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,20 +381,20 @@ errno_t LINALGEBRA_Coeff2Map_Loop(
exit(EXIT_FAILURE);
}
ts.tv_sec += 1;
semr = sem_timedwait(data.image[IDcoeff].semptr[3], &ts);
semr = ImageStreamIO_semtimedwait(data.image+IDcoeff, 3, &ts);

if(iter == 0)
{
// printf("driving semaphore to zero ... ");
// fflush(stdout);
sem_getvalue(data.image[IDcoeff].semptr[2], &semval);
semval = ImageStreamIO_semvalue(data.image+IDcoeff, 2);
for(scnt = 0; scnt < semval; scnt++)
{
printf("WARNING %s %d : sem_trywait on semptr2\n",
__FILE__,
__LINE__);
fflush(stdout);
sem_trywait(data.image[IDcoeff].semptr[2]);
ImageStreamIO_semtrywait(data.image+IDcoeff, 2);
}
// printf("done\n");
// fflush(stdout);
Expand Down Expand Up @@ -490,15 +490,15 @@ errno_t LINALGEBRA_Coeff2Map_Loop(
d_outmap,
sizeof(float) * mdim,
cudaMemcpyDeviceToHost);
sem_getvalue(data.image[IDoutmap].semptr[0], &semval);
semval = ImageStreamIO_semvalue(data.image+IDoutmap, 0);
if(semval < SEMAPHORE_MAXVAL)
{
sem_post(data.image[IDoutmap].semptr[0]);
ImageStreamIO_sempost(data.image+IDoutmap, 0);
}
sem_getvalue(data.image[IDoutmap].semptr[1], &semval);
semval = ImageStreamIO_semvalue(data.image+IDoutmap, 1);
if(semval < SEMAPHORE_MAXVAL)
{
sem_post(data.image[IDoutmap].semptr[1]);
ImageStreamIO_sempost(data.image+IDoutmap, 1);
}
data.image[IDoutmap].md[0].cnt0++;
data.image[IDoutmap].md[0].write = 0;
Expand Down
12 changes: 6 additions & 6 deletions plugins/milk-extra-src/linalgebra/cublas_linalgebra_MVMextractModesLoop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@ errno_t __attribute__((hot)) LINALGEBRA_MVMextractModesLoop_RUN()
}

// drive semaphore to zero
while(sem_trywait(data.image[ID_modeval].semptr[insem]) == 0)
while(ImageStreamIO_semtrywait(data.image+ID_modeval, insem) == 0)
{
printf("WARNING %s %d : sem_trywait on ID_modeval\n",
__FILE__,
Expand Down Expand Up @@ -1412,7 +1412,7 @@ errno_t __attribute__((hot)) LINALGEBRA_MVMextractModesLoop_RUN()
{
// WAIT FOR NEW MODEVAL
int rval;
rval = sem_wait(data.image[ID_modeval].semptr[insem]);
rval = ImageStreamIO_semwait(data.image+ID_modeval, insem);
if(rval == -1) // interrupt
{
loopOK = 0;
Expand All @@ -1435,15 +1435,15 @@ errno_t __attribute__((hot)) LINALGEBRA_MVMextractModesLoop_RUN()
}
data.image[IDtrace].md[0].cnt1 = TRACEindex;

sem_getvalue(data.image[IDtrace].semptr[0], &semval);
semval = ImageStreamIO_semvalue(data.image+IDtrace, 0);
if(semval < SEMAPHORE_MAXVAL)
{
sem_post(data.image[IDtrace].semptr[0]);
ImageStreamIO_sempost(data.image+IDtrace, 0);
}
sem_getvalue(data.image[IDtrace].semptr[1], &semval);
semval = ImageStreamIO_semvalue(data.image+IDtrace, 1);
if(semval < SEMAPHORE_MAXVAL)
{
sem_post(data.image[IDtrace].semptr[1]);
ImageStreamIO_sempost(data.image+IDtrace, 1);
}
data.image[IDtrace].md[0].cnt0++;
data.image[IDtrace].md[0].write = 0;
Expand Down
6 changes: 3 additions & 3 deletions plugins/milk-extra-src/linopt_imtools/linopt_imtools.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ imageID linopt_imtools_image_construct_stream(
}
else
{
sem_wait(data.image[IDcoeff].semptr[0]);
ImageStreamIO_semwait(data.image+IDcoeff, 0);
}
for(ii = 0; ii < sizexy; ii++)
Expand All @@ -372,10 +372,10 @@ imageID linopt_imtools_image_construct_stream(
data.image[IDout].array.F[ii] += data.image[IDcoeff].array.F[kk] *
data.image[IDmodes].array.F[kk * sizexy + ii];
}
sem_getvalue(data.image[IDout].semptr[0], &semval);
semval = ImageStreamIO_semvalue(data.image+IDout, 0);
if(semval < SEMAPHORE_MAXVAL)
{
sem_post(data.image[IDout].semptr[0]);
ImageStreamIO_sempost(data.image+IDout, 0);
}
data.image[IDout].md[0].cnt0++;
Expand Down
8 changes: 1 addition & 7 deletions src/COREMOD_memory/delete_image.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,17 +140,11 @@ errno_t delete_image(

if(data.image[ID].md[0].shared == 1)
{
for(s = 0; s < data.image[ID].md[0].sem; s++)
{
sem_close(data.image[ID].semptr[s]);
}

free(data.image[ID].semptr);
free(data.image[ID].semptr); // ?
data.image[ID].semptr = NULL;

if(data.image[ID].semlog != NULL)
{
sem_close(data.image[ID].semlog);
data.image[ID].semlog = NULL;
}

Expand Down
4 changes: 2 additions & 2 deletions src/COREMOD_memory/saveall.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,14 @@ errno_t COREMOD_MEMORY_SaveAll_sequ(const char *dirname,
fflush(stdout);

// drive semaphore to zero
while(sem_trywait(data.image[IDtrig].semptr[semtrig]) == 0)
while(ImageStreamIO_semtrywait(data.image+IDtrig, semtrig) == 0)
{
}

frame = 0;
while(frame < NBframes)
{
sem_wait(data.image[IDtrig].semptr[semtrig]);
ImageStreamIO_semwait(data.image+IDtrig, semtrig);
for(i = 0; i < imcnt; i++)
{
ID = IDarray[i];
Expand Down
26 changes: 13 additions & 13 deletions src/COREMOD_memory/stream_TCP.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ errno_t COREMOD_MEMORY_testfunction_semaphore(const char *IDname,
printf("\n");
usleep(500);

sem_getvalue(img_p->semptr[semtrig], &semval);
semval = ImageStreamIO_semvalue(img_p, semtrig);
snprintf(pinfomsg,
200,
"%ld TEST 0 semtrig %d ID %ld %d",
Expand All @@ -173,18 +173,18 @@ errno_t COREMOD_MEMORY_testfunction_semaphore(const char *IDname,

if(testmode == 0)
{
rv = sem_wait(img_p->semptr[semtrig]);
rv = ImageStreamIO_semwait(img_p, semtrig);
}

if(testmode == 1)
{
rv = sem_trywait(img_p->semptr[semtrig]);
rv = ImageStreamIO_semtrywait(img_p, semtrig);
}

if(testmode == 2)
{
sem_post(img_p->semptr[semtrig]);
rv = sem_wait(img_p->semptr[semtrig]);
ImageStreamIO_sempost(img_p, semtrig);
rv = ImageStreamIO_semwait(img_p, semtrig);
}

if(rv == -1)
Expand Down Expand Up @@ -220,7 +220,7 @@ errno_t COREMOD_MEMORY_testfunction_semaphore(const char *IDname,
printf(" OK\n");
}

sem_getvalue(img_p->semptr[semtrig], &semval);
semval = ImageStreamIO_semvalue(img_p, semtrig);
snprintf(pinfomsg,
200,
"%ld TEST 1 semtrig %d ID %ld %d",
Expand Down Expand Up @@ -471,26 +471,26 @@ imageID COREMOD_MEMORY_image_NETWORKtransmit(
}
ts.tv_sec += 2;

semr = sem_timedwait(img_p->semptr[semtrig], &ts);
semr = ImageStreamIO_semtimedwait(img_p, semtrig, &ts);

if(iter == 0)
{
processinfo_WriteMessage(processinfo, "Driving sem to 0");
printf("Driving semaphore to zero ... ");
fflush(stdout);
sem_getvalue(img_p->semptr[semtrig], &semval);
semval = ImageStreamIO_semvalue(img_p, semtrig);
int semvalcnt = semval;
for(scnt = 0; scnt < semvalcnt; scnt++)
{
sem_getvalue(img_p->semptr[semtrig], &semval);
semval = ImageStreamIO_semvalue(img_p, semtrig);
printf("sem = %d\n", semval);
fflush(stdout);
sem_trywait(img_p->semptr[semtrig]);
ImageStreamIO_semtrywait(img_p, semtrig);
}
printf("done\n");
fflush(stdout);

sem_getvalue(img_p->semptr[semtrig], &semval);
semval = ImageStreamIO_semvalue(img_p, semtrig);
printf("-> sem = %d\n", semval);
fflush(stdout);

Expand Down Expand Up @@ -1085,10 +1085,10 @@ imageID COREMOD_MEMORY_image_NETWORKreceive(int port,
img_p->md[0].cnt0++;
for(semnb = 0; semnb < img_p->md[0].sem; semnb++)
{
sem_getvalue(img_p->semptr[semnb], &semval);
semval = ImageStreamIO_semvalue(img_p, semnb);
if(semval < SEMAPHORE_MAXVAL)
{
sem_post(img_p->semptr[semnb]);
ImageStreamIO_sempost(img_p, semnb);
}
}

Expand Down
14 changes: 7 additions & 7 deletions src/COREMOD_memory/stream_UDP.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,26 +318,26 @@ imageID COREMOD_MEMORY_image_NETUDPtransmit(const char *IDname,
}
ts.tv_sec += 2;

semr = sem_timedwait(data.image[ID].semptr[semtrig], &ts);
semr = ImageStreamIO_semtimedwait(data.image+ID, semtrig, &ts);

if(iter == 0)
{
processinfo_WriteMessage(processinfo, "Driving sem to 0");
printf("Driving semaphore to zero ... ");
fflush(stdout);
sem_getvalue(data.image[ID].semptr[semtrig], &semval);
semval = ImageStreamIO_semvalue(data.image+ID, semtrig);
int semvalcnt = semval;
for(scnt = 0; scnt < semvalcnt; scnt++)
{
sem_getvalue(data.image[ID].semptr[semtrig], &semval);
semval = ImageStreamIO_semvalue(data.image+ID, semtrig);
printf("sem = %d\n", semval);
fflush(stdout);
sem_trywait(data.image[ID].semptr[semtrig]);
ImageStreamIO_semtrywait(data.image+ID, semtrig);
}
printf("done\n");
fflush(stdout);

sem_getvalue(data.image[ID].semptr[semtrig], &semval);
semval = ImageStreamIO_semvalue(data.image+ID, semtrig);
printf("-> sem = %d\n", semval);
fflush(stdout);

Expand Down Expand Up @@ -963,10 +963,10 @@ imageID COREMOD_MEMORY_image_NETUDPreceive(
data.image[ID].md[0].cnt0++;
for(semnb = 0; semnb < data.image[ID].md[0].sem; semnb++)
{
sem_getvalue(data.image[ID].semptr[semnb], &semval);
semval = ImageStreamIO_semvalue(data.image+ID, semnb);
if(semval < SEMAPHORE_MAXVAL)
{
sem_post(data.image[ID].semptr[semnb]);
ImageStreamIO_sempost(data.image+ID, semnb);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/COREMOD_memory/stream_diff.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ imageID COREMOD_MEMORY_streamDiff(const char *IDstream0_name,
}
else
{
sem_wait(data.image[ID0].semptr[semtrig]);
ImageStreamIO_semwait(data.image+ID0, semtrig);
}

data.image[IDout].md[0].write = 1;
Expand Down
2 changes: 1 addition & 1 deletion src/COREMOD_memory/stream_halfimdiff.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ imageID COREMOD_MEMORY_stream_halfimDiff(const char *IDstream_name,
}
else
{
sem_wait(data.image[ID0].semptr[semtrig]);
ImageStreamIO_semwait(data.image+ID0, semtrig);
}

data.image[IDout].md[0].write = 1;
Expand Down
Loading

0 comments on commit 0c6c656

Please sign in to comment.