mirrors/pspy
1
0
Fork 0
mirror of https://github.com/DominicBreuker/pspy.git synced 2025-12-21 03:34:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from DominicBreuker/fix-read-syscall

Browse Source 
Fix errno 22 errors
This commit is contained in:
Dominic Breuker
2019-08-11 23:12:40 +02:00
committed by GitHub
parent 0c973089dd 0e4d11951b
commit 4c0edc540c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -17,7 +17,7 @@ test:
# Drops you into a shell in the development container and mounts the source code # Drops you into a shell in the development container and mounts the source code
# You can edit to source on your host, then run go commans (e.g., `go test ./...`) inside the container # You can edit to source on your host, then run go commans (e.g., `go test ./...`) inside the container
dev: dev:
sh -c "if ! docker image ls | grep '$(DEV_IMAGE)'; then echo 'building dev image'; docker build -f $(DEV_DOCKERFILE) -t $(DEV_IMAGE) .; fi" sh -c "if ! docker image ls | grep '$(DEV_IMAGE)' | cut -d ':' -f1; then echo 'building dev image'; docker build -f $(DEV_DOCKERFILE) -t $(DEV_IMAGE) .; fi"
docker run -it \ docker run -it \
--rm \ --rm \
-v $(PROJECT_DIR):/go/src/github.com/dominicbreuker/pspy \ -v $(PROJECT_DIR):/go/src/github.com/dominicbreuker/pspy \
@@ -38,7 +38,7 @@ example:
# builds one set of static binaries that should work on any system without dependencies, but are huge # builds one set of static binaries that should work on any system without dependencies, but are huge
# builds another set of binaries that are as small as possible, but may not work # builds another set of binaries that are as small as possible, but may not work
build: build:
sh -c "if ! docker image ls | grep '$(BUILD_IMAGE)'; then echo 'building build image'; docker build -f $(BUILD_DOCKERFILE) -t $(BUILD_IMAGE) .; fi" sh -c "if ! docker image ls | grep '$(BUILD_IMAGE)' | cut -d ':' -f1; then echo 'building build image'; docker build -f $(BUILD_DOCKERFILE) -t $(BUILD_IMAGE) .; fi"
mkdir -p $(PROJECT_DIR)/bin mkdir -p $(PROJECT_DIR)/bin
docker run -it \ docker run -it \

5
internal/fswatcher/inotify/inotify.go
View File

@@ -17,7 +17,8 @@ const maximumWatchersFile = "/proc/sys/fs/inotify/max_user_watches"
// set to -1 if the number cannot be determined // set to -1 if the number cannot be determined
var MaxWatchers int = -1 var MaxWatchers int = -1
const EventSize int = unix.SizeofInotifyEvent // sizeof(struct inotify_event) + NAME_MAX + 1
const EventSize int = unix.SizeofInotifyEvent + 255 + 1
func init() { func init() {
mw, err := getMaxWatchers() mw, err := getMaxWatchers()
@@ -71,7 +72,7 @@ func (i *Inotify) Watch(dir string) error {
func (i *Inotify) Read(buf []byte) (int, error) { func (i *Inotify) Read(buf []byte) (int, error) {
n, errno := unix.Read(i.FD, buf) n, errno := unix.Read(i.FD, buf)
if n < 0 { if n < 1 {
return n, fmt.Errorf("reading from inotify fd %d: errno: %d", i.FD, errno) return n, fmt.Errorf("reading from inotify fd %d: errno: %d", i.FD, errno)
} }
return n, nil return n, nil