Changes in libcfa/src/concurrency/clib/cfathread.h [d971c8d:038110a]

File:

• libcfa/src/concurrency/clib/cfathread.h (modified) (2 diffs)

libcfa/src/concurrency/clib/cfathread.h

@@ -14 +14 @@
 //
 
+#include "stddef.h"
+#include "invoke.h"
+
 #if defined(__cforall) || defined(__cplusplus)
 extern "C" {
 #endif
-        #include <asm/types.h>
-        #include <errno.h>
-        #include <unistd.h>
-
+        //--------------------
+        // Basic types
+        struct cfathread_CRunner_t;
+        typedef struct cfathread_CRunner_t * cfathread_t;
 
         //--------------------
-        // Basic types
-
-        typedef struct cluster * cfathread_cluster_t;
-
-        int cfathread_cluster_create(cfathread_cluster_t * cluster);
-        cfathread_cluster_t cfathread_cluster_self(void);
-        int cfathread_cluster_print_stats(cfathread_cluster_t cluster);
-        int cfathread_cluster_add_worker(cfathread_cluster_t cluster, pthread_t* tid, void (*init_routine) (void *), void * arg);
-        int cfathread_cluster_pause (cfathread_cluster_t cluster);
-        int cfathread_cluster_resume(cfathread_cluster_t cluster);
-
-        //--------------------
-        // thread attribute
-        typedef struct cfathread_attr {
-                cfathread_cluster_t cl;
-        } cfathread_attr_t;
-
-        int cfathread_attr_init(cfathread_attr_t * attr) __attribute__((nonnull (1)));
-        static inline int cfathread_attr_destroy(cfathread_attr_t * attr) __attribute__((nonnull (1)));
-        static inline int cfathread_attr_destroy(cfathread_attr_t * attr) { return 0; }
-        static inline int cfathread_attr_setbackground(cfathread_attr_t * attr, int background) __attribute__((nonnull (1)));
-        static inline int cfathread_attr_setbackground(cfathread_attr_t * attr, int background) { return 0; }
-        static inline int cfathread_attr_setcluster(cfathread_attr_t * attr, cfathread_cluster_t cl) __attribute__((nonnull (1)));
-        static inline int cfathread_attr_setcluster(cfathread_attr_t * attr, cfathread_cluster_t cl) { attr->cl = cl; return 0; }
-
-        //--------------------
-        // thread type
-        struct cfathread_object;
-        typedef struct cfathread_object * cfathread_t;
-
-        int cfathread_create( cfathread_t * h, const cfathread_attr_t * a, void *(*main)( void * ), void * arg ) __attribute__((nonnull (1)));
-        int cfathread_join( cfathread_t, void ** retval );
-
-        int cfathread_get_errno(void);
-        cfathread_t cfathread_self(void);
-
-        int cfathread_usleep(useconds_t usecs);
-        int cfathread_sleep(unsigned int secs);
+        // Basic thread support
+        cfathread_t cfathread_create( void (*main)( cfathread_t ) );
+        void cfathread_join( cfathread_t );
 
         void cfathread_park( void );
@@ -67 +35 @@
 
         //--------------------
-        // mutex and condition
-        struct timespec;
+        // Basic kernel features
+        void cfathread_setproccnt( int );
 
-        typedef struct cfathread_mutex_attr {
-        } cfathread_mutexattr_t;
-        typedef struct cfathread_mutex * cfathread_mutex_t;
-        int cfathread_mutex_init(cfathread_mutex_t *restrict mut, const cfathread_mutexattr_t *restrict attr) __attribute__((nonnull (1)));
-        int cfathread_mutex_destroy(cfathread_mutex_t *mut) __attribute__((nonnull (1)));
-        int cfathread_mutex_lock(cfathread_mutex_t *mut) __attribute__((nonnull (1)));
-        int cfathread_mutex_trylock(cfathread_mutex_t *mut) __attribute__((nonnull (1)));
-        int cfathread_mutex_unlock(cfathread_mutex_t *mut) __attribute__((nonnull (1)));
-
-        typedef struct cfathread_cond_attr {
-        } cfathread_condattr_t;
-        typedef struct cfathread_condition * cfathread_cond_t;
-        int cfathread_cond_init(cfathread_cond_t *restrict cond, const cfathread_condattr_t *restrict attr) __attribute__((nonnull (1)));
-        int cfathread_cond_wait(cfathread_cond_t *restrict cond, cfathread_mutex_t *restrict mut) __attribute__((nonnull (1,2)));
-        int cfathread_cond_timedwait(cfathread_cond_t *restrict cond, cfathread_mutex_t *restrict mut, const struct timespec *restrict abstime) __attribute__((nonnull (1,2,3)));
-        int cfathread_cond_signal(cfathread_cond_t *cond) __attribute__((nonnull (1)));
-
-        //--------------------
-        // IO operations
-        struct sockaddr;
-        struct msghdr;
-        int cfathread_socket(int domain, int type, int protocol);
-        int cfathread_bind(int socket, const struct sockaddr *address, socklen_t address_len);
-        int cfathread_listen(int socket, int backlog);
-        int cfathread_accept(int socket, struct sockaddr *restrict address, socklen_t *restrict address_len);
-        int cfathread_connect(int socket, const struct sockaddr *address, socklen_t address_len);
-        int cfathread_dup(int fildes);
-        int cfathread_close(int fildes);
-        ssize_t cfathread_sendmsg(int socket, const struct msghdr *message, int flags);
-        ssize_t cfathread_write(int fildes, const void *buf, size_t nbyte);
-        ssize_t cfathread_recvfrom(int socket, void *restrict buffer, size_t length, int flags, struct sockaddr *restrict address, socklen_t *restrict address_len);
-        ssize_t cfathread_read(int fildes, void *buf, size_t nbyte);
 
 #if defined(__cforall) || defined(__cplusplus)