vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #195 from cyphar/fix-c-formatting-epoll-arm64

Browse source 
archutils: aarch64: fix build and improve C formatting
This commit is contained in:
Michael Crosby 2016-04-18 10:54:15 -07:00
commit 4e54940c10
2 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
archutils/epoll.go
View file

@ -1,4 +1,5 @@
//+build !arm64,linux // +build linux,!aarch64
package archutils package archutils
import ( import (

40
archutils/epoll_aarch64.go
View file

@ -1,35 +1,35 @@
// +build arm64,linux // +build linux,aarch64
package archutils package archutils
// #include <sys/epoll.h> // #include <sys/epoll.h>
/* /*
int EpollCreate1(int flag) { int EpollCreate1(int flag) {
return epoll_create1(flag); return epoll_create1(flag);
} }
int EpollCtl(int efd, int op, int sfd, int Events, int Fd) { int EpollCtl(int efd, int op,int sfd, int events, int fd) {
struct epoll_event event; struct epoll_event event;
event.events = Events; event.events = events;
event.data.fd = Fd; event.data.fd = fd;
return epoll_ctl(efd, op, sfd, &event); return epoll_ctl(efd, op, sfd, &event);
} }
typedef struct Event{ struct event_t {
uint32_t events; uint32_t events;
int fd; int fd;
}; };
struct epoll_event events[128]; struct epoll_event events[128];
int run_epoll_wait(int fd, struct Event *event) { int run_epoll_wait(int fd, struct event_t *event) {
int n, i; int n, i;
n = epoll_wait(fd, events, 128, -1); n = epoll_wait(fd, events, 128, -1);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
event[i].events = events[i].events; event[i].events = events[i].events;
event[i].fd = events[i].data.fd; event[i].fd = events[i].data.fd;
} }
return n; return n;
} }
*/ */
import "C" import "C"
@ -57,8 +57,8 @@ func EpollCtl(epfd int, op int, fd int, event *syscall.EpollEvent) error {
} }
func EpollWait(epfd int, events []syscall.EpollEvent, msec int) (int, error) { func EpollWait(epfd int, events []syscall.EpollEvent, msec int) (int, error) {
var c_events [128]C.struct_Event var c_events [128]C.struct_event_t
n := int(C.run_epoll_wait(C.int(epfd), (*C.struct_Event)(unsafe.Pointer(&c_events)))) n := int(C.run_epoll_wait(C.int(epfd), (*C.struct_event_t)(unsafe.Pointer(&c_events))))
if n < 0 { if n < 0 {
return int(n), fmt.Errorf("Failed to wait epoll") return int(n), fmt.Errorf("Failed to wait epoll")
} }