update

[l4.git] / l4 / pkg / plr / ex / pthread_mutex / main.c

diff --git a/l4/pkg/plr/ex/pthread_mutex/main.c b/l4/pkg/plr/ex/pthread_mutex/main.c
index be33cfd0adaea1637d2f4583e645f44fbd58a775..bac8c3b1218fe16cee0ef23a47dae2b9d272e139 100644 (file)
--- a/l4/pkg/plr/ex/pthread_mutex/main.c
+++ b/l4/pkg/plr/ex/pthread_mutex/main.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <assert.h>
+#include <sys/time.h>
 
 #include <pthread.h>
 #include <pthread-l4.h>
@@ -11,43 +12,80 @@
 static int globalcounter;
 pthread_mutex_t mtx;
 
+static const unsigned print_iterations = 100;
+static const unsigned inc_iterations   = 10000;
+
 static
 void *thread(void *data)
 {
        (void)data;
+#if 0
        while (1) {
-               for (unsigned i = 0; i < 10000; ++i) {
+#else
+       for (unsigned cnt = 0; cnt < print_iterations; ++cnt) {
+#endif
+               for (unsigned i = 0; i < inc_iterations; ++i) {
                        pthread_mutex_lock(&mtx);
                        globalcounter++;
                        pthread_mutex_unlock(&mtx);
                }
+
+               pthread_mutex_lock(&mtx);
                printf("\033[31mThread: %d\n", globalcounter);
+               pthread_mutex_unlock(&mtx);
        }
        return NULL;
 }
 
+
+static int diff_ms(struct timeval *t1, struct timeval *t2)
+{
+       return (((t1->tv_sec - t2->tv_sec) * 1000000) + 
+               (t1->tv_usec - t2->tv_usec))/1000;
+}
+
+
 int main(int argc, char **argv)
 {
        (void)argc; (void)argv;
 
        pthread_t pt;
+
+       struct timeval start, stop;
+
+       gettimeofday(&start, NULL);
+
        pthread_mutex_init(&mtx, 0);
 
        int res = pthread_create(&pt, NULL, thread, NULL);
        assert(res == 0);
 
+#if 0
        while (1) {
-               for (unsigned i = 0; i < 10000; ++i) {
+#else
+       for (unsigned cnt = 0; cnt < print_iterations; ++cnt) {
+#endif
+               for (unsigned i = 0; i < inc_iterations; ++i) {
                        pthread_mutex_lock(&mtx);
                        globalcounter++;
                        pthread_mutex_unlock(&mtx);
                }
+
+               pthread_mutex_lock(&mtx);
                printf("\033[32mMain: %d\n", globalcounter);
+               pthread_mutex_unlock(&mtx);
        }
 
        pthread_join(pt, NULL);
 
-       enter_kdebug("before return");
+       gettimeofday(&stop, NULL);
+
+       unsigned long ms = diff_ms(&stop, &start);
+       printf("Start %ld.%ld --- Stop %ld.%ld --- Diff %ld.%03ld\n",
+              start.tv_sec, start.tv_usec, stop.tv_sec, stop.tv_usec,
+              ms / 1000, ms % 1000);
+
+       //enter_kdebug("before return");
 
        return 0;
 }