Changeset 15e4e22

Timestamp:

Oct 25, 2017, 1:52:22 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

6395817

Parents:

114014c (diff), f1dd17a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/benchmark

Files:

• CorCtxSwitch.c (modified) (3 diffs)
• PthrdCtxSwitch.c (modified) (2 diffs)

src/benchmark/CorCtxSwitch.c

@@ -7 +7 @@
 coroutine GreatSuspender {};
 
-void ?{}( GreatSuspender * this ) {
+void ?{}( GreatSuspender & this ) {
         prime(this);
 }
 
-void main( GreatSuspender * this )
+void main( GreatSuspender & this )
 {
         while( true ) {
@@ -18 +18 @@
 }
 
-void resumer( GreatSuspender * this, const unsigned int NoOfTimes ) {
+void resumer( GreatSuspender & this, const unsigned int NoOfTimes ) {
         for ( volatile unsigned int i = 0; i < NoOfTimes; i += 1 ) {
                 resume( this );
@@ -31 +31 @@
 
         StartTime = Time();
-        resumer( &s, NoOfTimes );
+        resumer( s, NoOfTimes );
         EndTime = Time();
 

src/benchmark/PthrdCtxSwitch.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <stdlib.h>
-#define _GNU_SOURCE
-#include <pthread.h>
+
+#include <sched.h>
 
 #include "bench.h"
@@ -12 +12 @@
         StartTime = Time();
         for ( volatile unsigned int i = 0; i < NoOfTimes; i += 1 ) {
-                pthread_yield();
+                sched_yield();
         }
         EndTime = Time();