Merge branch 'master' of https://github.com/nieklinnenbank/FreeNOS

werchou · Oct 19, 2015 · 6ccb245 · 6ccb245
2 parents f8cd873 + 70112f2
commit 6ccb245
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/bin/mpiprime/Main.cpp b/bin/mpiprime/Main.cpp
@@ -217,9 +217,13 @@ int main(int argc, char **argv)
     // Free resources
     MPI_Finalize();
     free(map);
-    gettimeofday(&t2, &tz);
-    printf("Finalize: ");
-    printtimediff(&t1, &t2);
-    printf("\n");
+
+    if (rank == 0)
+    {
+        gettimeofday(&t2, &tz);
+        printf("Finalize: ");
+        printtimediff(&t1, &t2);
+        printf("\n");
+    }
     return EXIT_SUCCESS;
 }
diff --git a/bin/prime/Main.cpp b/bin/prime/Main.cpp
@@ -8,6 +8,7 @@
 #include <String.h>
 #include <unistd.h>
 #include <math.h>
+#include <errno.h>
 
 void search_sequential(int k, int n, unsigned *map, int argc, char **argv)
 {

diff --git a/lib/libposix/sys/time/printtimediff.cpp b/lib/libposix/sys/time/printtimediff.cpp
@@ -15,10 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <FreeNOS/API.h>
+#include <sys/types.h>
 #include <sys/time.h>
 #include <errno.h>
 #include <stdio.h>
+#include <Types.h>
 
 int printtimediff(struct timeval *t1, struct timeval *t2)
 {