packbuilder: use HandleList for C function callbacks.

This commit is contained in:
Patrick Steinhardt 2015-04-24 10:16:12 +02:00
parent 83f9e6a705
commit a843b7247f
1 changed files with 10 additions and 3 deletions

View File

@ -110,8 +110,13 @@ type packbuilderCbData struct {
} }
//export packbuilderForEachCb //export packbuilderForEachCb
func packbuilderForEachCb(buf unsafe.Pointer, size C.size_t, payload unsafe.Pointer) int { func packbuilderForEachCb(buf unsafe.Pointer, size C.size_t, handle unsafe.Pointer) int {
data := (*packbuilderCbData)(payload) payload := pointerHandles.Get(handle)
data, ok := payload.(*packbuilderCbData)
if !ok {
panic("could not get packbuilder CB data")
}
slice := C.GoBytes(buf, C.int(size)) slice := C.GoBytes(buf, C.int(size))
err := data.callback(slice) err := data.callback(slice)
@ -130,11 +135,13 @@ func (pb *Packbuilder) ForEach(callback PackbuilderForeachCallback) error {
callback: callback, callback: callback,
err: nil, err: nil,
} }
handle := pointerHandles.Track(&data)
defer pointerHandles.Untrack(handle)
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() 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 { if err == C.GIT_EUSER {
return data.err return data.err
} }