Changeset dffabf0 in mainline for uspace/lib/c/include

Timestamp:

2011-01-05T19:08:03Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f03d3786

Parents:

e84d65a (diff), 196ef08 (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 mainline changes

Conflicts: no problem solving.
Added new apps to ignore list.

Location:

uspace/lib/c/include

Files:

• async.h (modified) (1 diff)
• async_sess.h (moved) (moved from uspace/lib/c/include/async_rel.h ) (1 diff)
• net/socket.h (modified) (1 diff)
• task.h (modified) (1 diff)

uspace/lib/c/include/async.h

@@ -37 +37 @@
 
 #include <ipc/ipc.h>
+#include <async_sess.h>
 #include <fibril.h>
 #include <sys/time.h>

uspace/lib/c/include/async_sess.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_ASYNC_REL_H_
-#define LIBC_ASYNC_REL_H_
+#ifndef LIBC_ASYNC_SESS_H_
+#define LIBC_ASYNC_SESS_H_
 
-extern int async_rel_init(void);
-extern int async_relation_create(int);
-extern void async_relation_destroy(int, int);
+#include <adt/list.h>
+
+typedef struct {
+        int sess_phone;         /**< Phone for cloning off the connections. */
+        link_t conn_head;       /**< List of open data connections. */
+        link_t sess_link;       /**< Link in global list of open sessions. */
+} async_sess_t;
+
+extern void _async_sess_init(void);
+extern void async_session_create(async_sess_t *, int);
+extern void async_session_destroy(async_sess_t *);
+extern int async_exchange_begin(async_sess_t *);
+extern void async_exchange_end(async_sess_t *, int);
 
 #endif

uspace/lib/c/include/net/socket.h

@@ -60 +60 @@
 extern int sendto(int, const void *, size_t, int, const struct sockaddr *,
     socklen_t);
-extern int recv(int, void *, size_t, int);
-extern int recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
+extern ssize_t recv(int, void *, size_t, int);
+extern ssize_t recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
 extern int getsockopt(int, int, int, void *, size_t *);
 extern int setsockopt(int, int, int, const void *, size_t);

uspace/lib/c/include/task.h

@@ -47 +47 @@
 extern task_id_t task_get_id(void);
 extern int task_set_name(const char *);
+extern int task_kill(task_id_t);
+
 extern task_id_t task_spawn(const char *, const char *const[], int *);
 extern int task_spawnv(task_id_t *, const char *path, const char *const []);