summaryrefslogtreecommitdiff
path: root/pfinet/socket-ops.c
diff options
context:
space:
mode:
Diffstat (limited to 'pfinet/socket-ops.c')
-rw-r--r--pfinet/socket-ops.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/pfinet/socket-ops.c b/pfinet/socket-ops.c
index b4172dc4..3f8b7fbc 100644
--- a/pfinet/socket-ops.c
+++ b/pfinet/socket-ops.c
@@ -60,7 +60,7 @@ S_socket_create (struct trivfs_protid *master,
if (protocol < 0)
return EPROTONOSUPPORT;
- __mutex_lock (&global_lock);
+ pthread_mutex_lock (&global_lock);
become_task_protid (master);
@@ -97,7 +97,7 @@ S_socket_create (struct trivfs_protid *master,
ports_port_deref (user);
}
- __mutex_unlock (&global_lock);
+ pthread_mutex_unlock (&global_lock);
return err;
}
@@ -112,10 +112,10 @@ S_socket_listen (struct sock_user *user, int queue_limit)
if (!user)
return EOPNOTSUPP;
- __mutex_lock (&global_lock);
+ pthread_mutex_lock (&global_lock);
become_task (user);
err = - (*user->sock->ops->listen) (user->sock, queue_limit);
- __mutex_unlock (&global_lock);
+ pthread_mutex_unlock (&global_lock);
return err;
}
@@ -136,7 +136,7 @@ S_socket_accept (struct sock_user *user,
sock = user->sock;
- __mutex_lock (&global_lock);
+ pthread_mutex_lock (&global_lock);
become_task (user);
@@ -169,7 +169,7 @@ S_socket_accept (struct sock_user *user,
sock_release (newsock);
}
- __mutex_unlock (&global_lock);
+ pthread_mutex_unlock (&global_lock);
return err;
}
@@ -186,14 +186,14 @@ S_socket_connect (struct sock_user *user,
sock = user->sock;
- __mutex_lock (&global_lock);
+ pthread_mutex_lock (&global_lock);
become_task (user);
err = - (*sock->ops->connect) (sock, &addr->address, addr->address.sa_len,
sock->flags);
- __mutex_unlock (&global_lock);
+ pthread_mutex_unlock (&global_lock);
/* MiG should do this for us, but it doesn't. */
if (!err)
@@ -213,11 +213,11 @@ S_socket_bind (struct sock_user *user,
if (! addr)
return EADDRNOTAVAIL;
- __mutex_lock (&global_lock);
+ pthread_mutex_lock (&global_lock);
become_task (user);
err = - (*user->sock->ops->bind) (user->sock,
&addr->address, addr->address.sa_len);
- __mutex_unlock (&global_lock);
+ pthread_mutex_unlock (&global_lock);
/* MiG should do this for us, but it doesn't. */
if (!err)
@@ -234,10 +234,10 @@ S_socket_name (struct sock_user *user,
if (!user)
return EOPNOTSUPP;
- __mutex_lock (&global_lock);
+ pthread_mutex_lock (&global_lock);
become_task (user);
make_sockaddr_port (user->sock, 0, addr_port, addr_port_name);
- __mutex_unlock (&global_lock);
+ pthread_mutex_unlock (&global_lock);
return 0;
}
@@ -251,10 +251,10 @@ S_socket_peername (struct sock_user *user,
if (!user)
return EOPNOTSUPP;
- __mutex_lock (&global_lock);
+ pthread_mutex_lock (&global_lock);
become_task (user);
err = make_sockaddr_port (user->sock, 1, addr_port, addr_port_name);
- __mutex_unlock (&global_lock);
+ pthread_mutex_unlock (&global_lock);
return err;
}
@@ -268,7 +268,7 @@ S_socket_connect2 (struct sock_user *user1,
if (!user1 || !user2)
return EOPNOTSUPP;
- __mutex_lock (&global_lock);
+ pthread_mutex_lock (&global_lock);
become_task (user1);
@@ -280,7 +280,7 @@ S_socket_connect2 (struct sock_user *user1,
else
err = - (*user1->sock->ops->socketpair) (user1->sock, user2->sock);
- __mutex_unlock (&global_lock);
+ pthread_mutex_unlock (&global_lock);
/* MiG should do this for us, but it doesn't. */
if (!err)
@@ -362,10 +362,10 @@ S_socket_shutdown (struct sock_user *user,
if (!user)
return EOPNOTSUPP;
- __mutex_lock (&global_lock);
+ pthread_mutex_lock (&global_lock);
become_task (user);
err = - (*user->sock->ops->shutdown) (user->sock, direction);
- __mutex_unlock (&global_lock);
+ pthread_mutex_unlock (&global_lock);
return err;
}
@@ -382,7 +382,7 @@ S_socket_getopt (struct sock_user *user,
if (! user)
return EOPNOTSUPP;
- __mutex_lock (&global_lock);
+ pthread_mutex_lock (&global_lock);
become_task (user);
int len = *datalen;
@@ -391,7 +391,7 @@ S_socket_getopt (struct sock_user *user,
(user->sock, level, option, *data, &len);
*datalen = len;
- __mutex_unlock (&global_lock);
+ pthread_mutex_unlock (&global_lock);
/* XXX option data not properly typed, needs byte-swapping for netmsgserver.
Most options are ints, some like IP_OPTIONS are bytesex-neutral. */
@@ -414,14 +414,14 @@ S_socket_setopt (struct sock_user *user,
/* XXX option data not properly typed, needs byte-swapping for netmsgserver.
Most options are ints, some like IP_OPTIONS are bytesex-neutral. */
- __mutex_lock (&global_lock);
+ pthread_mutex_lock (&global_lock);
become_task (user);
err = - (level == SOL_SOCKET ? sock_setsockopt
: *user->sock->ops->setsockopt)
(user->sock, level, option, data, datalen);
- __mutex_unlock (&global_lock);
+ pthread_mutex_unlock (&global_lock);
return err;
}
@@ -452,12 +452,12 @@ S_socket_send (struct sock_user *user,
if (nports != 0 || controllen != 0)
return EINVAL;
- __mutex_lock (&global_lock);
+ pthread_mutex_lock (&global_lock);
become_task (user);
if (user->sock->flags & O_NONBLOCK)
m.msg_flags |= MSG_DONTWAIT;
sent = (*user->sock->ops->sendmsg) (user->sock, &m, datalen, 0);
- __mutex_unlock (&global_lock);
+ pthread_mutex_unlock (&global_lock);
/* MiG should do this for us, but it doesn't. */
if (addr && sent >= 0)
@@ -513,12 +513,12 @@ S_socket_recv (struct sock_user *user,
iov.iov_base = *data;
iov.iov_len = amount;
- __mutex_lock (&global_lock);
+ pthread_mutex_lock (&global_lock);
become_task (user);
if (user->sock->flags & O_NONBLOCK)
flags |= MSG_DONTWAIT;
err = (*user->sock->ops->recvmsg) (user->sock, &m, amount, flags, 0);
- __mutex_unlock (&global_lock);
+ pthread_mutex_unlock (&global_lock);
if (err < 0)
err = -err;