Skip to content

Commit

Permalink
packbuilder: use HandleList for C function callbacks.
Browse files Browse the repository at this point in the history
  • Loading branch information
pks-t committed May 22, 2015
1 parent 83f9e6a commit a843b72
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions packbuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,13 @@ type packbuilderCbData struct {
}

//export packbuilderForEachCb
func packbuilderForEachCb(buf unsafe.Pointer, size C.size_t, payload unsafe.Pointer) int {
data := (*packbuilderCbData)(payload)
func packbuilderForEachCb(buf unsafe.Pointer, size C.size_t, handle unsafe.Pointer) int {
payload := pointerHandles.Get(handle)
data, ok := payload.(*packbuilderCbData)
if !ok {
panic("could not get packbuilder CB data")
}

slice := C.GoBytes(buf, C.int(size))

err := data.callback(slice)
Expand All @@ -130,11 +135,13 @@ func (pb *Packbuilder) ForEach(callback PackbuilderForeachCallback) error {
callback: callback,
err: nil,
}
handle := pointerHandles.Track(&data)
defer pointerHandles.Untrack(handle)

runtime.LockOSThread()
defer runtime.UnlockOSThread()

err := C._go_git_packbuilder_foreach(pb.ptr, unsafe.Pointer(&data))
err := C._go_git_packbuilder_foreach(pb.ptr, handle)
if err == C.GIT_EUSER {
return data.err
}
Expand Down

0 comments on commit a843b72

Please sign in to comment.