mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix caching math and clean up cachetest.c 

https://github.com/Hamlib/Hamlib/issues/228
pull/236/head
mdblack98 2020-05-02 23:10:55 -05:00
rodzic b244fe234c
commit d75272ddac
2 zmienionych plików z 17 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
src/misc.c
Wyświetl plik

@ -1260,6 +1260,10 @@ int HAMLIB_API elapsed_ms(struct timespec *start, int option)
struct timespec stop; struct timespec stop;
double elapsed_msec; double elapsed_msec;
if (option == ELAPSED_SET) {
start->tv_sec = start->tv_nsec = 0;
}
rig_debug(RIG_DEBUG_TRACE, "%s: start = %ld,%ld\n", __func__, rig_debug(RIG_DEBUG_TRACE, "%s: start = %ld,%ld\n", __func__,
(long)start->tv_sec, (long)start->tv_nsec); (long)start->tv_sec, (long)start->tv_nsec);
@ -1286,7 +1290,7 @@ int HAMLIB_API elapsed_ms(struct timespec *start, int option)
break; break;
} }
elapsed_msec = ((stop.tv_sec - start->tv_sec) + (stop.tv_nsec/1e9 - elapsed_msec = ((stop.tv_sec - start->tv_sec) + (stop.tv_nsec/1e9 -
start->tv_nsec/1e9)) / 1e3; start->tv_nsec/1e9)) * 1e3;
rig_debug(RIG_DEBUG_TRACE, "%s: elapsed_secs=%g\n", __func__, elapsed_msec); rig_debug(RIG_DEBUG_TRACE, "%s: elapsed_secs=%g\n", __func__, elapsed_msec);

24
tests/cachetest.c
Wyświetl plik

@ -101,7 +101,7 @@ int main(int argc, char *argv[])
printf("Rig_info: '%s'\n", info_buf); printf("Rig_info: '%s'\n", info_buf);
} }
elapsed_ms(&startall, 1); elapsed_ms(&startall, ELAPSED_SET);
for (i = 0; i < loops; ++i) for (i = 0; i < loops; ++i)
{ {
@ -111,47 +111,47 @@ int main(int argc, char *argv[])
ptt_t ptt; ptt_t ptt;
split_t split; split_t split;
elapsed_ms(&start, 1); elapsed_ms(&start, ELAPSED_SET);
retcode = rig_get_vfo(my_rig, &vfo); retcode = rig_get_vfo(my_rig, &vfo);
if (retcode != RIG_OK) { printf("Get vfo failed?? Err=%s\n", rigerror(retcode)); } if (retcode != RIG_OK) { printf("Get vfo failed?? Err=%s\n", rigerror(retcode)); }
printf("%4dms: VFO = %s\n", elapsed_ms(&start, 0), rig_strvfo(vfo)); printf("%4dms: VFO = %s\n", elapsed_ms(&start, ELAPSED_GET), rig_strvfo(vfo));
elapsed_ms(&start, 1); elapsed_ms(&start, ELAPSED_SET);
retcode = rig_get_freq(my_rig, RIG_VFO_CURR, &freq); retcode = rig_get_freq(my_rig, RIG_VFO_CURR, &freq);
if (retcode != RIG_OK) { printf("Get freq failed?? Err=%s\n", rigerror(retcode)); } if (retcode != RIG_OK) { printf("Get freq failed?? Err=%s\n", rigerror(retcode)); }
printf("%4dms: VFO freq. = %.1f Hz\n", elapsed_ms(&start, 0), freq); printf("%4dms: VFO freq. = %.1f Hz\n", elapsed_ms(&start, ELAPSED_GET), freq);
elapsed_ms(&start, 1); elapsed_ms(&start, ELAPSED_SET);
retcode = rig_get_mode(my_rig, RIG_VFO_CURR, &mode, &width); retcode = rig_get_mode(my_rig, RIG_VFO_CURR, &mode, &width);
if (retcode != RIG_OK) { printf("Get mode failed?? Err=%s\n", rigerror(retcode)); } if (retcode != RIG_OK) { printf("Get mode failed?? Err=%s\n", rigerror(retcode)); }
printf("%4dms: Current mode = %s, width = %ld\n", elapsed_ms(&start, 0), printf("%4dms: Current mode = %s, width = %ld\n", elapsed_ms(&start, ELAPSED_GET),
rig_strrmode(mode), width); rig_strrmode(mode), width);
elapsed_ms(&start, 1); elapsed_ms(&start, ELAPSED_SET);
retcode = rig_get_ptt(my_rig, RIG_VFO_A, &ptt); retcode = rig_get_ptt(my_rig, RIG_VFO_A, &ptt);
if (retcode != RIG_OK) { printf("Get ptt failed?? Err=%s\n", rigerror(retcode)); } if (retcode != RIG_OK) { printf("Get ptt failed?? Err=%s\n", rigerror(retcode)); }
printf("%4dms: ptt=%d\n", elapsed_ms(&start, 0), ptt); printf("%4dms: ptt=%d\n", elapsed_ms(&start, ELAPSED_GET), ptt);
#if 1 #if 1
elapsed_ms(&start, 1); elapsed_ms(&start, ELAPSED_SET);
retcode = rig_get_split_vfo(my_rig, RIG_VFO_A, &split, &vfo); retcode = rig_get_split_vfo(my_rig, RIG_VFO_A, &split, &vfo);
if (retcode != RIG_OK) { printf("Get split_vfo failed?? Err=%s\n", rigerror(retcode)); } if (retcode != RIG_OK) { printf("Get split_vfo failed?? Err=%s\n", rigerror(retcode)); }
printf("%4dms: split=%d, tx_vfo=%s\n", elapsed_ms(&start, 0), split, printf("%4dms: split=%d, tx_vfo=%s\n", elapsed_ms(&start, ELAPSED_GET), split,
rig_strvfo(vfo)); rig_strvfo(vfo));
#endif #endif
} }
printf("Elapsed %gsec\n", elapsed_ms(&startall, 0) / 1000.0); printf("Elapsed %gsec\n", elapsed_ms(&startall, ELAPSED_GET) / 1000.0);
rig_close(my_rig); rig_close(my_rig);
return 0; return 0;