From 2a5ce2913c6535ee35c03061c36326e0e464fe2b Mon Sep 17 00:00:00 2001 From: Jerry Ling Date: Thu, 16 Mar 2023 14:50:52 -0400 Subject: [PATCH] update xrootd --- X/xrootdgo/build_tarballs.jl | 4 ++-- X/xrootdgo/bundled/main.go | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/X/xrootdgo/build_tarballs.jl b/X/xrootdgo/build_tarballs.jl index 0f8c443ade3..3e3024b857d 100644 --- a/X/xrootdgo/build_tarballs.jl +++ b/X/xrootdgo/build_tarballs.jl @@ -1,11 +1,11 @@ using BinaryBuilder name = "xrootdgo" -version = v"0.31.1" +version = v"0.32.1" sources = [ GitSource("https://github.com/go-hep/hep/", - "c31af820c54f9d88ecdf40fe46a8bcf3a59f6f25"), + "18cd86eeb7ce2e816e349c2e53ddda93feb98948"), DirectorySource("./bundled") ] diff --git a/X/xrootdgo/bundled/main.go b/X/xrootdgo/bundled/main.go index 6ad65c4c165..ee2bde48bdc 100644 --- a/X/xrootdgo/bundled/main.go +++ b/X/xrootdgo/bundled/main.go @@ -5,9 +5,9 @@ import "C" import ( "github.com/google/uuid" "unsafe" - // "fmt" + "fmt" "context" - "log" + // "log" "go-hep.org/x/hep/xrootd" "go-hep.org/x/hep/xrootd/xrdfs" ) @@ -22,10 +22,12 @@ func Open(_baseurl *C.char, _filepath *C.char, _username *C.char) *C.char { ctx := context.Background() client, _ := xrootd.NewClient(ctx, baseurl, username) file, err := client.FS().Open(ctx, filepath, xrdfs.OpenModeOwnerRead, xrdfs.OpenOptionsOpenRead) + _id := C.CString(uuid.NewString()) if err != nil { - log.Fatal(err) + fmt.Println(err) + _id = C.CString("error") + return _id } - _id := C.CString(uuid.NewString()) _FILES[_id] = file return _id } @@ -36,10 +38,10 @@ func Close(_id *C.char){ file, found := _FILES[_id] if !found { - log.Fatal("can't find id to close") + fmt.Println("can't find id to close") } if err := file.Close(ctx); err != nil { - log.Fatal(err) + fmt.Println(err) } } @@ -50,7 +52,7 @@ func Size(_id *C.char) C.long { info, err := file.Stat(ctx) if err != nil { - log.Fatal(err) + fmt.Println(err) } return C.long(info.EntrySize) } @@ -62,7 +64,7 @@ func ReadAt(res unsafe.Pointer, _id *C.char, NBytes C.long, offset C.long) { // data := (*(*[2147483647]byte)(res))[:NBytes] _, err := file.ReadAt(data, int64(offset)) if err != nil { - log.Fatal(err) + fmt.Println(err) } }