正在显示
1 个修改的文件
包含
16 行增加
和
33 行删除
trunk/research/st/public.h
100755 → 100644
| @@ -97,8 +97,7 @@ extern "C" { | @@ -97,8 +97,7 @@ extern "C" { | ||
| 97 | extern void st_thread_exit(void *retval); | 97 | extern void st_thread_exit(void *retval); |
| 98 | extern int st_thread_join(st_thread_t thread, void **retvalp); | 98 | extern int st_thread_join(st_thread_t thread, void **retvalp); |
| 99 | extern void st_thread_interrupt(st_thread_t thread); | 99 | extern void st_thread_interrupt(st_thread_t thread); |
| 100 | - extern st_thread_t st_thread_create(void *(*start)(void *arg), void *arg, | ||
| 101 | - int joinable, int stack_size); | 100 | + extern st_thread_t st_thread_create(void *(*start)(void *arg), void *arg, int joinable, int stack_size); |
| 102 | extern int st_randomize_stacks(int on); | 101 | extern int st_randomize_stacks(int on); |
| 103 | extern int st_set_utime_function(st_utime_t (*func)(void)); | 102 | extern int st_set_utime_function(st_utime_t (*func)(void)); |
| 104 | 103 | ||
| @@ -137,37 +136,21 @@ extern "C" { | @@ -137,37 +136,21 @@ extern "C" { | ||
| 137 | extern int st_netfd_poll(st_netfd_t fd, int how, st_utime_t timeout); | 136 | extern int st_netfd_poll(st_netfd_t fd, int how, st_utime_t timeout); |
| 138 | 137 | ||
| 139 | extern int st_poll(struct pollfd *pds, int npds, st_utime_t timeout); | 138 | extern int st_poll(struct pollfd *pds, int npds, st_utime_t timeout); |
| 140 | - extern st_netfd_t st_accept(st_netfd_t fd, struct sockaddr *addr, int *addrlen, | ||
| 141 | - st_utime_t timeout); | ||
| 142 | - extern int st_connect(st_netfd_t fd, const struct sockaddr *addr, int addrlen, | ||
| 143 | - st_utime_t timeout); | ||
| 144 | - extern ssize_t st_read(st_netfd_t fd, void *buf, size_t nbyte, | ||
| 145 | - st_utime_t timeout); | ||
| 146 | - extern ssize_t st_read_fully(st_netfd_t fd, void *buf, size_t nbyte, | ||
| 147 | - st_utime_t timeout); | ||
| 148 | - extern int st_read_resid(st_netfd_t fd, void *buf, size_t *resid, | ||
| 149 | - st_utime_t timeout); | ||
| 150 | - extern ssize_t st_readv(st_netfd_t fd, const struct iovec *iov, int iov_size, | ||
| 151 | - st_utime_t timeout); | ||
| 152 | - extern int st_readv_resid(st_netfd_t fd, struct iovec **iov, int *iov_size, | ||
| 153 | - st_utime_t timeout); | ||
| 154 | - extern ssize_t st_write(st_netfd_t fd, const void *buf, size_t nbyte, | ||
| 155 | - st_utime_t timeout); | ||
| 156 | - extern int st_write_resid(st_netfd_t fd, const void *buf, size_t *resid, | ||
| 157 | - st_utime_t timeout); | ||
| 158 | - extern ssize_t st_writev(st_netfd_t fd, const struct iovec *iov, int iov_size, | ||
| 159 | - st_utime_t timeout); | ||
| 160 | - extern int st_writev_resid(st_netfd_t fd, struct iovec **iov, int *iov_size, | ||
| 161 | - st_utime_t timeout); | ||
| 162 | - extern int st_recvfrom(st_netfd_t fd, void *buf, int len, | ||
| 163 | - struct sockaddr *from, int *fromlen, | ||
| 164 | - st_utime_t timeout); | ||
| 165 | - extern int st_sendto(st_netfd_t fd, const void *msg, int len, | ||
| 166 | - const struct sockaddr *to, int tolen, st_utime_t timeout); | ||
| 167 | - extern int st_recvmsg(st_netfd_t fd, struct msghdr *msg, int flags, | ||
| 168 | - st_utime_t timeout); | ||
| 169 | - extern int st_sendmsg(st_netfd_t fd, const struct msghdr *msg, int flags, | ||
| 170 | - st_utime_t timeout); | 139 | + extern st_netfd_t st_accept(st_netfd_t fd, struct sockaddr *addr, int *addrlen, st_utime_t timeout); |
| 140 | + extern int st_connect(st_netfd_t fd, const struct sockaddr *addr, int addrlen, st_utime_t timeout); | ||
| 141 | + extern ssize_t st_read(st_netfd_t fd, void *buf, size_t nbyte, st_utime_t timeout); | ||
| 142 | + extern ssize_t st_read_fully(st_netfd_t fd, void *buf, size_t nbyte, st_utime_t timeout); | ||
| 143 | + extern int st_read_resid(st_netfd_t fd, void *buf, size_t *resid, st_utime_t timeout); | ||
| 144 | + extern ssize_t st_readv(st_netfd_t fd, const struct iovec *iov, int iov_size, st_utime_t timeout); | ||
| 145 | + extern int st_readv_resid(st_netfd_t fd, struct iovec **iov, int *iov_size, st_utime_t timeout); | ||
| 146 | + extern ssize_t st_write(st_netfd_t fd, const void *buf, size_t nbyte, st_utime_t timeout); | ||
| 147 | + extern int st_write_resid(st_netfd_t fd, const void *buf, size_t *resid, st_utime_t timeout); | ||
| 148 | + extern ssize_t st_writev(st_netfd_t fd, const struct iovec *iov, int iov_size, st_utime_t timeout); | ||
| 149 | + extern int st_writev_resid(st_netfd_t fd, struct iovec **iov, int *iov_size, st_utime_t timeout); | ||
| 150 | + extern int st_recvfrom(st_netfd_t fd, void *buf, int len, struct sockaddr *from, int *fromlen, st_utime_t timeout); | ||
| 151 | + extern int st_sendto(st_netfd_t fd, const void *msg, int len, const struct sockaddr *to, int tolen, st_utime_t timeout); | ||
| 152 | + extern int st_recvmsg(st_netfd_t fd, struct msghdr *msg, int flags, st_utime_t timeout); | ||
| 153 | + extern int st_sendmsg(st_netfd_t fd, const struct msghdr *msg, int flags, st_utime_t timeout); | ||
| 171 | extern st_netfd_t st_open(const char *path, int oflags, mode_t mode); | 154 | extern st_netfd_t st_open(const char *path, int oflags, mode_t mode); |
| 172 | 155 | ||
| 173 | #ifdef DEBUG | 156 | #ifdef DEBUG |
-
请 注册 或 登录 后发表评论