mainscnt/mains-frequency-counter-rpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

protect counter variables

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2019-10-04 14:48:57 +02:00
parent 56b89f66b7
commit d85852ea51
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
snippets/test1/test1.c
View File

@ -65,6 +65,7 @@ uint32_t counter = 0;
uint32_t diff = 0; uint32_t diff = 0;
pthread_mutex_t counterMutex = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t eventMutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t eventMutex = PTHREAD_MUTEX_INITIALIZER;
pthread_cond_t eventSignal = PTHREAD_COND_INITIALIZER; pthread_cond_t eventSignal = PTHREAD_COND_INITIALIZER;
@ -101,11 +102,14 @@ void isr() {
uint32_t currentCounter = read32(CMD_RD | REG_OTR); uint32_t currentCounter = read32(CMD_RD | REG_OTR);
pthread_mutex_lock(&counterMutex);
diff = currentCounter - lastCounter; diff = currentCounter - lastCounter;
counter = currentCounter; counter = currentCounter;
lastCounter = currentCounter;
ec++; ec++;
pthread_mutex_unlock(&counterMutex);
lastCounter = currentCounter;
pthread_mutex_lock(&eventMutex); pthread_mutex_lock(&eventMutex);
pthread_cond_signal(&eventSignal); pthread_cond_signal(&eventSignal);
@ -132,6 +136,9 @@ void initCounter() {
int main (void) { int main (void) {
static uint32_t lastDiff = 0; static uint32_t lastDiff = 0;
uint32_t my_ec = 0;
uint32_t my_counter = 0;
uint32_t my_diff = 0;
init(); init();
initCounter(); initCounter();
@ -141,6 +148,12 @@ int main (void) {
pthread_cond_wait(&eventSignal, &eventMutex); pthread_cond_wait(&eventSignal, &eventMutex);
pthread_mutex_unlock(&eventMutex); pthread_mutex_unlock(&eventMutex);
pthread_mutex_lock(&counterMutex);
my_ec = ec;
my_counter = counter;
my_diff = diff;
pthread_mutex_unlock(&counterMutex);
if (diff != lastDiff) { if (diff != lastDiff) {
lastDiff = diff; lastDiff = diff;
double f = 1.0 / (((double) diff) / 1000000.0); double f = 1.0 / (((double) diff) / 1000000.0);