Comprehensive update, add some GC fixes, update examples to new MacOS
header file layout.
This commit is contained in:
+12
-12
@@ -12,28 +12,28 @@ import (
|
||||
//Shortcut for literal NSStrings
|
||||
var nst = ns.NSStringWithGoString
|
||||
|
||||
func pb1() {
|
||||
func pb1(self ns.GButton, super ns.GButtonSupermethods) {
|
||||
fmt.Println("Pushed button 1")
|
||||
}
|
||||
|
||||
func pb2() {
|
||||
func pb2(self ns.GButton, super ns.GButtonSupermethods) {
|
||||
fmt.Println("Pushed button 2")
|
||||
a.Terminate(a)
|
||||
}
|
||||
|
||||
func db() {
|
||||
func db(self ns.GButton, super ns.GButtonSupermethods) {
|
||||
fmt.Println("button deallocated")
|
||||
}
|
||||
|
||||
func didFinishLaunching(n *ns.NSNotification) {
|
||||
func didFinishLaunching(self ns.AppDelegate, n *ns.NSNotification) {
|
||||
fmt.Println("Go: did finish launching")
|
||||
fmt.Printf("Notification: %s\n", n.Name().UTF8String())
|
||||
//Set up an NSWindow
|
||||
win = ns.NSWindowAlloc().InitWithContentRectStyleMask(
|
||||
ns.NSMakeRect(200, 200, 600, 600),
|
||||
ns.NSWindowStyleMaskTitled|ns.NSWindowStyleMaskClosable|
|
||||
ns.NSWindowStyleMaskResizable,
|
||||
ns.NSBackingStoreBuffered,
|
||||
ns.NSWindowStyleMask(ns.NSWindowStyleMaskTitled|ns.NSWindowStyleMaskClosable|
|
||||
ns.NSWindowStyleMaskResizable),
|
||||
ns.NSBackingStoreType(ns.NSBackingStoreBuffered),
|
||||
0,
|
||||
)
|
||||
// We do not need to retain this because we are in garbage collection mode
|
||||
@@ -103,21 +103,21 @@ func didFinishLaunching(n *ns.NSNotification) {
|
||||
cv.AddConstraints(ns.NSLayoutConstraintsWithVisualFormat(
|
||||
nst("H:|-[b1]"), 0, nil, viewmap))
|
||||
cv.AddConstraints(ns.NSLayoutConstraintsWithVisualFormat(
|
||||
nst("H:[b1]-[b2]"), ns.NSLayoutFormatAlignAllBaseline, nil, viewmap))
|
||||
nst("H:[b1]-[b2]"), ns.NSLayoutFormatOptions(ns.NSLayoutFormatAlignAllBaseline), nil, viewmap))
|
||||
|
||||
a.ActivateIgnoringOtherApps(1)
|
||||
}
|
||||
|
||||
func shouldTerminateAfterLastWindowClosed(s *ns.NSApplication) ns.BOOL {
|
||||
func shouldTerminateAfterLastWindowClosed(self ns.AppDelegate, s *ns.NSApplication) ns.BOOL {
|
||||
fmt.Println("Go: should terminate after last window closed")
|
||||
return 1
|
||||
}
|
||||
|
||||
func willTerminate(n *ns.NSNotification) {
|
||||
func willTerminate(self ns.AppDelegate, n *ns.NSNotification) {
|
||||
fmt.Println("Go: will terminate")
|
||||
}
|
||||
|
||||
func didBecomeActive(n *ns.NSNotification) {
|
||||
func didBecomeActive(self ns.AppDelegate, n *ns.NSNotification) {
|
||||
fmt.Println("Go: did become active")
|
||||
fmt.Printf("Notification: %s\n", n.Name().UTF8String())
|
||||
}
|
||||
@@ -132,7 +132,7 @@ func app() {
|
||||
// Lock OS thread because Cocoa uses thread-local storage
|
||||
runtime.LockOSThread()
|
||||
a = ns.NSApplicationSharedApplication()
|
||||
a.SetActivationPolicy(ns.NSApplicationActivationPolicyRegular)
|
||||
a.SetActivationPolicy(ns.NSApplicationActivationPolicy(ns.NSApplicationActivationPolicyRegular))
|
||||
|
||||
// Set up an AppDelegate
|
||||
// assign it to a global variable so it doesn't get garbage collected
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# nswrap.yaml
|
||||
inputfiles:
|
||||
- /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h
|
||||
- /System/Library/Frameworks/AppKit.framework/Headers/AppKit.h
|
||||
- /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h
|
||||
- /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/AppKit.framework/Headers/AppKit.h
|
||||
|
||||
classes:
|
||||
- NSAutoreleasePool
|
||||
|
||||
@@ -5,14 +5,14 @@ import "C"
|
||||
import (
|
||||
"encoding/binary"
|
||||
"fmt"
|
||||
"git.wow.st/gmp/nswrap/examples/bluetooth/ns"
|
||||
"runtime"
|
||||
"time"
|
||||
"git.wow.st/gmp/nswrap/examples/bluetooth/ns"
|
||||
)
|
||||
|
||||
func updateState(c *ns.CBCentralManager) {
|
||||
func updateState(self ns.CBDelegate, c *ns.CBCentralManager) {
|
||||
fmt.Printf("Go: did update state\n")
|
||||
switch cm.CBManager.State() {
|
||||
switch ns.NSInteger(cm.CBManager.State()) {
|
||||
case ns.CBManagerStateUnknown:
|
||||
fmt.Printf(" unknown\n")
|
||||
case ns.CBManagerStateResetting:
|
||||
@@ -30,7 +30,7 @@ func updateState(c *ns.CBCentralManager) {
|
||||
fmt.Printf("Go: updateState returning\n")
|
||||
}
|
||||
|
||||
func discoverPeripheral(c *ns.CBCentralManager, p *ns.CBPeripheral, d *ns.NSDictionary, rssi *ns.NSNumber) {
|
||||
func discoverPeripheral(self ns.CBDelegate, c *ns.CBCentralManager, p *ns.CBPeripheral, d *ns.NSDictionary, rssi *ns.NSNumber) {
|
||||
fmt.Printf("Did discover peripheral\n")
|
||||
c.StopScan()
|
||||
|
||||
@@ -51,7 +51,7 @@ func discoverPeripheral(c *ns.CBCentralManager, p *ns.CBPeripheral, d *ns.NSDict
|
||||
c.ConnectPeripheral(peripheral, nil)
|
||||
}
|
||||
|
||||
func connectPeripheral(c *ns.CBCentralManager, p *ns.CBPeripheral) {
|
||||
func connectPeripheral(self ns.CBDelegate, c *ns.CBCentralManager, p *ns.CBPeripheral) {
|
||||
fmt.Printf("Did connect peripheral\n")
|
||||
|
||||
// set ourselves up as a peripheral delegate
|
||||
@@ -64,7 +64,7 @@ func connectPeripheral(c *ns.CBCentralManager, p *ns.CBPeripheral) {
|
||||
fmt.Printf("Go: discoverPeripheral returning\n")
|
||||
}
|
||||
|
||||
func discoverServices(p *ns.CBPeripheral, e *ns.NSError) {
|
||||
func discoverServices(self ns.CBDelegate, p *ns.CBPeripheral, e *ns.NSError) {
|
||||
fmt.Printf("Did discover services\n")
|
||||
p.Services().ObjectEnumerator().ForIn(func(o *ns.Id) bool {
|
||||
serv := o.CBService()
|
||||
@@ -97,7 +97,7 @@ func hr(d *ns.NSData) int {
|
||||
}
|
||||
}
|
||||
|
||||
func discoverCharacteristics(p *ns.CBPeripheral, s *ns.CBService, e *ns.NSError) {
|
||||
func discoverCharacteristics(self ns.CBDelegate, p *ns.CBPeripheral, s *ns.CBService, e *ns.NSError) {
|
||||
fmt.Printf("Did discover characteristics\n")
|
||||
uuid := s.UUID()
|
||||
fmt.Printf("----%s\n", uuid.UUIDString())
|
||||
@@ -117,7 +117,7 @@ func discoverCharacteristics(p *ns.CBPeripheral, s *ns.CBService, e *ns.NSError)
|
||||
fmt.Printf("Go: discoverCharacteristics returning\n")
|
||||
}
|
||||
|
||||
func updateValue(p *ns.CBPeripheral, chr *ns.CBCharacteristic, e *ns.NSError) {
|
||||
func updateValue(self ns.CBDelegate, p *ns.CBPeripheral, chr *ns.CBCharacteristic, e *ns.NSError) {
|
||||
if chr.UUID().IsEqualTo(hrv_uuid) {
|
||||
v := chr.Value()
|
||||
fmt.Printf("Heart rate: %d\n", hr(v))
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
inputfiles:
|
||||
- /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h
|
||||
- /System/Library/Frameworks/CoreBluetooth.framework/Headers/CoreBluetooth.h
|
||||
- /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h
|
||||
- /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreBluetooth.framework/Headers/CoreBluetooth.h
|
||||
|
||||
classes:
|
||||
- NSObject
|
||||
|
||||
+16
-16
@@ -46,7 +46,7 @@ func main() {
|
||||
fmt.Printf("\nNSArray.ObjectEnumerator().ForIn():\n")
|
||||
x := 0
|
||||
a.ObjectEnumerator().ForIn(func(o *ns.Id) bool {
|
||||
fmt.Printf("%d: %s\n",x,o.NSString())
|
||||
fmt.Printf("%d: %s\n", x, o.NSString())
|
||||
x++
|
||||
return true
|
||||
})
|
||||
@@ -72,7 +72,7 @@ func main() {
|
||||
}
|
||||
return true
|
||||
})
|
||||
fmt.Printf("a = %p a.NSArray = %p\n",a,&a.NSArray)
|
||||
fmt.Printf("a = %p a.NSArray = %p\n", a, &a.NSArray)
|
||||
fmt.Printf("\nNSArrayWithObjects() (length 1)\n")
|
||||
a2 = ns.NSArrayWithObjects(n1)
|
||||
a2.ObjectEnumerator().ForIn(func(o *ns.Id) bool {
|
||||
@@ -109,8 +109,8 @@ func main() {
|
||||
oarr := make([]*ns.Id, 0, 5)
|
||||
fmt.Printf("Length of oarr is %d\n", len(oarr))
|
||||
karr := make([]*ns.Id, 0, 5)
|
||||
fmt.Printf("\nGetObjects()\n")
|
||||
d.GetObjects(&oarr, &karr, 4)
|
||||
fmt.Printf("\nGetObjectsAndKeysCount()\n")
|
||||
d.GetObjectsAndKeysCount(&oarr, &karr, 4)
|
||||
fmt.Printf("Length of oarr is now %d\n", len(oarr))
|
||||
for i, k := range karr {
|
||||
fmt.Printf("-- %s -> %s\n", k.NSString(), oarr[i].NSString())
|
||||
@@ -119,11 +119,11 @@ func main() {
|
||||
err := make([]*ns.NSError, 1)
|
||||
n1 = ns.NSStringWithContentsOfURLEncoding(ns.NSURLWithGoString("http://captive.apple.com"), ns.NSUTF8StringEncoding, &err)
|
||||
if len(err) == 0 {
|
||||
fmt.Printf("n1 = %s\n",n1)
|
||||
fmt.Printf("n1 = %s\n", n1)
|
||||
}
|
||||
n1 = ns.NSStringWithContentsOfURLEncoding(ns.NSURLWithGoString("htttypo://example.com"), ns.NSUTF8StringEncoding, &err)
|
||||
if len(err) > 0 {
|
||||
fmt.Printf("err[0] = %p -> %p\n",err[0],err[0].Ptr())
|
||||
fmt.Printf("err[0] = %p -> %p\n", err[0], err[0].Ptr())
|
||||
fmt.Printf("err: %s\n", err[0].LocalizedDescription())
|
||||
}
|
||||
|
||||
@@ -137,26 +137,26 @@ func main() {
|
||||
fmt.Printf("\nArrayWithObjects\n")
|
||||
a2 = ns.NSArrayWithObjects(gs1, gs2)
|
||||
a2.ObjectEnumerator().ForIn(func(o *ns.Id) bool {
|
||||
fmt.Printf("--%s\n",o.NSString())
|
||||
fmt.Printf("--%s\n", o.NSString())
|
||||
return true
|
||||
})
|
||||
dir,e := os.Getwd()
|
||||
dir, e := os.Getwd()
|
||||
if e != nil {
|
||||
fmt.Printf("Failed to get current working directory. %s\n",err)
|
||||
fmt.Printf("Failed to get current working directory. %s\n", err)
|
||||
os.Exit(-1)
|
||||
}
|
||||
path := nst(dir)
|
||||
filter := ns.NSArrayWithObjects(nst("ast"),nst("yaml"))
|
||||
ost := make([]*ns.NSString,0,1)
|
||||
oar:= make([]*ns.NSArray,0,1)
|
||||
filter := ns.NSArrayWithObjects(nst("ast"), nst("yaml"))
|
||||
ost := make([]*ns.NSString, 0, 1)
|
||||
oar := make([]*ns.NSArray, 0, 1)
|
||||
fmt.Printf("\nCompletePathIntoString()\n")
|
||||
i := path.CompletePathIntoString(&ost,0,&oar,filter)
|
||||
fmt.Printf("%d matches\n",i)
|
||||
i := path.CompletePathIntoString(&ost, 0, &oar, filter)
|
||||
fmt.Printf("%d matches\n", i)
|
||||
if i > 0 {
|
||||
fmt.Printf("ost = %s\n",ost[0])
|
||||
fmt.Printf("ost = %s\n", ost[0])
|
||||
fmt.Printf("oar =\n")
|
||||
oar[0].ObjectEnumerator().ForIn(func(o *ns.Id) bool {
|
||||
fmt.Printf("--%s\n",o.NSString())
|
||||
fmt.Printf("--%s\n", o.NSString())
|
||||
return true
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
inputfiles:
|
||||
- /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h
|
||||
- /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h
|
||||
classes:
|
||||
- NSAutoreleasePool
|
||||
- NSArray
|
||||
|
||||
@@ -2,25 +2,24 @@ package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"unsafe"
|
||||
"git.wow.st/gmp/nswrap/examples/functions/ns"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
func main() {
|
||||
var s ns.Stat
|
||||
ns.Puts(ns.CharWithGoString("Hi there"))
|
||||
ret := ns.Fstat(3,&s)
|
||||
fmt.Printf("Fstat: %d\n",ret)
|
||||
ret := ns.Fstat(3, &s)
|
||||
fmt.Printf("Fstat: %d\n", ret)
|
||||
|
||||
fmt.Printf("Opening file\n")
|
||||
f := ns.Fopen(ns.CharWithGoString("nswrap.yaml"),ns.CharWithGoString("r"))
|
||||
ret = ns.Fstat(3,&s)
|
||||
fmt.Printf("Fstat: %d\n",ret)
|
||||
chr := make([]byte,4096)
|
||||
f := ns.Fopen(ns.CharWithGoString("nswrap.yaml"), ns.CharWithGoString("r"))
|
||||
ret = ns.Fstat(3, &s)
|
||||
fmt.Printf("Fstat: %d\n", ret)
|
||||
chr := make([]byte, 4096)
|
||||
i := ns.Fread(unsafe.Pointer(&chr[0]), 1, 4096, f)
|
||||
if i < 4096 {
|
||||
chr = chr[:i]
|
||||
}
|
||||
fmt.Printf("file contents:\n%s\n",string(chr))
|
||||
fmt.Printf("file contents:\n%s\n", string(chr))
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
inputfiles:
|
||||
- /usr/include/stdio.h
|
||||
- /usr/include/stdlib.h
|
||||
- /usr/include/sys/stat.h
|
||||
- /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/stdio.h
|
||||
- /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/stdlib.h
|
||||
- /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/stat.h
|
||||
sysimports:
|
||||
- stdio.h
|
||||
- stdlib.h
|
||||
|
||||
+29
-30
@@ -9,8 +9,8 @@ import (
|
||||
"git.wow.st/gmp/nswrap/examples/gc/ns"
|
||||
)
|
||||
|
||||
func releaseX(x int) func (ns.MyClassSupermethods) {
|
||||
return func(super ns.MyClassSupermethods) {
|
||||
func releaseX(x int) func(ns.MyClass, ns.MyClassSupermethods) {
|
||||
return func(self ns.MyClass, super ns.MyClassSupermethods) {
|
||||
//fmt.Printf("--release %d\n", x)
|
||||
super.Release() // comment out for leak
|
||||
}
|
||||
@@ -19,7 +19,7 @@ func releaseX(x int) func (ns.MyClassSupermethods) {
|
||||
func memtest1() {
|
||||
fmt.Println("memtest1 started")
|
||||
for {
|
||||
arr := make([]*ns.MyClass,1000)
|
||||
arr := make([]*ns.MyClass, 1000)
|
||||
for i := 0; i < 1000; i++ {
|
||||
// Alloc methods set a finalizer that causes the Go GC to
|
||||
// Release these objects.
|
||||
@@ -33,7 +33,7 @@ func memtest1() {
|
||||
// Manually run the Go GC at every loop iteration. May not be needed
|
||||
// in a real program.
|
||||
runtime.GC()
|
||||
time.Sleep(time.Second/50)
|
||||
time.Sleep(time.Second / 50)
|
||||
//fmt.Printf("Loop complete\n")
|
||||
}
|
||||
}
|
||||
@@ -42,8 +42,8 @@ func memtest2() {
|
||||
fmt.Println("memtest2 started")
|
||||
i := 0
|
||||
for {
|
||||
o1 := ns.NSStringAlloc().InitWithGoString(fmt.Sprintf("two string %d",i))
|
||||
o2 := ns.NSStringWithGoString(fmt.Sprintf("two string %d",i))
|
||||
o1 := ns.NSStringAlloc().InitWithGoString(fmt.Sprintf("two string %d", i))
|
||||
o2 := ns.NSStringWithGoString(fmt.Sprintf("two string %d", i))
|
||||
|
||||
// NSWrap runs object constructors inside an @autoreleasepool block,
|
||||
// and then calls "retain" on them before returning to Go. A Go
|
||||
@@ -58,9 +58,9 @@ func memtest2() {
|
||||
// init methods in Objective-C always return a retained object.
|
||||
// init may or may not return the same object that was sent in.
|
||||
|
||||
a1 = a1.InitWithObjects(o1,o2,o3,o4)
|
||||
a1 = a1.InitWithObjects(o1, o2, o3, o4)
|
||||
|
||||
a2 := ns.NSArrayWithObjects(o1,o2,o3,o4)
|
||||
a2 := ns.NSArrayWithObjects(o1, o2, o3, o4)
|
||||
|
||||
// you can always nest alloc and init.
|
||||
|
||||
@@ -74,7 +74,7 @@ func memtest2() {
|
||||
_ = a3
|
||||
|
||||
runtime.GC()
|
||||
time.Sleep(time.Second/50)
|
||||
time.Sleep(time.Second / 50)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -121,7 +121,7 @@ func memtest4() {
|
||||
_ = o1
|
||||
_ = c1
|
||||
runtime.GC()
|
||||
time.Sleep(time.Second/50)
|
||||
time.Sleep(time.Second / 50)
|
||||
c1.Free() // you need to manually free UTF8Strings
|
||||
}
|
||||
}
|
||||
@@ -134,7 +134,7 @@ func memtest5() {
|
||||
// a new NSString object at each loop iteration and cannot be reusing
|
||||
// the same string object.
|
||||
|
||||
str := ns.NSStringWithGoString(fmt.Sprintf("blue string %d",i))
|
||||
str := ns.NSStringWithGoString(fmt.Sprintf("blue string %d", i))
|
||||
|
||||
// SubstringFromIndex should be returning a newly allocated NSString,
|
||||
// which is getting retained by NSWrap and released by a Go GC
|
||||
@@ -146,7 +146,7 @@ func memtest5() {
|
||||
u := sub.UTF8String()
|
||||
u2 := sub2.UTF8String()
|
||||
u3 := sub3.UTF8String()
|
||||
time.Sleep(time.Second/50)
|
||||
time.Sleep(time.Second / 50)
|
||||
runtime.GC()
|
||||
i++
|
||||
u.Free()
|
||||
@@ -160,30 +160,29 @@ func memtest5() {
|
||||
}
|
||||
|
||||
func tmpdict(i int) *ns.NSString {
|
||||
o1 := ns.NSStringWithGoString(fmt.Sprintf("temp string 1-%d",i))
|
||||
o2 := ns.NSStringWithGoString(fmt.Sprintf("temp string 2-%d",i))
|
||||
k1 := ns.NSStringWithGoString(fmt.Sprintf("temp key 1-%d",i))
|
||||
k2 := ns.NSStringWithGoString(fmt.Sprintf("temp key 2-%d",i))
|
||||
dict := ns.NSDictionaryWithObjectsAndKeys(o1,k1,o2,k2)
|
||||
o1 := ns.NSStringWithGoString(fmt.Sprintf("temp string 1-%d", i))
|
||||
o2 := ns.NSStringWithGoString(fmt.Sprintf("temp string 2-%d", i))
|
||||
k1 := ns.NSStringWithGoString(fmt.Sprintf("temp key 1-%d", i))
|
||||
k2 := ns.NSStringWithGoString(fmt.Sprintf("temp key 2-%d", i))
|
||||
dict := ns.NSDictionaryWithObjectsAndKeys(o1, k1, o2, k2)
|
||||
ret := dict.ValueForKey(k1)
|
||||
//fmt.Printf("tmpdict(): string = %s\n",ret.NSString())
|
||||
|
||||
defer runtime.GC() // o1, o2, k1, k2, and dict can be released after we return
|
||||
defer runtime.GC() // o1, o2, k1, k2, and dict can be released after we return
|
||||
return ret.NSString() // should be retained by NSDictionary.ValueForKey()
|
||||
}
|
||||
|
||||
func tmparr(i int) *ns.NSString {
|
||||
o1 := ns.NSStringWithGoString(fmt.Sprintf("temp string 3-%d",i))
|
||||
o2 := ns.NSStringWithGoString(fmt.Sprintf("temp string 4-%d",i))
|
||||
arr := ns.NSArrayWithObjects(o1,o2)
|
||||
os := make([]*ns.Id,0,2)
|
||||
arr.GetObjects(&os, ns.NSMakeRange(0,2))
|
||||
o1 := ns.NSStringWithGoString(fmt.Sprintf("temp string 3-%d", i))
|
||||
o2 := ns.NSStringWithGoString(fmt.Sprintf("temp string 4-%d", i))
|
||||
arr := ns.NSArrayWithObjects(o1, o2)
|
||||
os := make([]*ns.Id, 0, 2)
|
||||
arr.GetObjectsRange(&os, ns.NSMakeRange(0, 2))
|
||||
|
||||
defer runtime.GC() // collect o1, o2 and arr
|
||||
defer runtime.GC() // collect o1, o2 and arr
|
||||
return os[1].NSString() // should have been retained by NSArray.GetObjects()
|
||||
}
|
||||
|
||||
|
||||
func memtest6() {
|
||||
fmt.Println("memtest6 started")
|
||||
i := 0
|
||||
@@ -193,13 +192,13 @@ func memtest6() {
|
||||
time.Sleep(time.Second / 5)
|
||||
u1 := s1.String() // make sure s1 and s2 are still available
|
||||
u2 := s2.String()
|
||||
e1 := fmt.Sprintf("temp string 1-%d",i)
|
||||
e1 := fmt.Sprintf("temp string 1-%d", i)
|
||||
if u1 != e1 {
|
||||
fmt.Printf("tmpdict() error: %s != %s\n",u1,e1)
|
||||
fmt.Printf("tmpdict() error: %s != %s\n", u1, e1)
|
||||
}
|
||||
e2 := fmt.Sprintf("temp string 4-%d",i)
|
||||
e2 := fmt.Sprintf("temp string 4-%d", i)
|
||||
if u2 != e2 {
|
||||
fmt.Printf("tmparr() error: %s != %s\n",u2,e2)
|
||||
fmt.Printf("tmparr() error: %s != %s\n", u2, e2)
|
||||
|
||||
}
|
||||
i++
|
||||
@@ -221,7 +220,7 @@ func main() {
|
||||
go func() {
|
||||
for {
|
||||
// print a progress indicator
|
||||
fmt.Printf("t = %s\n",time.Now())
|
||||
fmt.Printf("t = %s\n", time.Now())
|
||||
time.Sleep(time.Second * 10)
|
||||
}
|
||||
}()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
inputfiles:
|
||||
- /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h
|
||||
- /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h
|
||||
classes:
|
||||
- NSAutoreleasePool
|
||||
- NSArray
|
||||
|
||||
@@ -10,13 +10,13 @@ import (
|
||||
"git.wow.st/gmp/nswrap/examples/memory/ns"
|
||||
)
|
||||
|
||||
func dealloc() {
|
||||
func dealloc(self ns.MyClass, super ns.MyClassSupermethods) {
|
||||
//[super dealloc] is called for you automatically, so no Supermethods
|
||||
//struct is provided here.
|
||||
fmt.Println("--dealloc called")
|
||||
}
|
||||
|
||||
func release(super ns.MyClassSupermethods) {
|
||||
func release(self ns.MyClass, super ns.MyClassSupermethods) {
|
||||
fmt.Println("--release called")
|
||||
super.Release() // comment out for leak
|
||||
}
|
||||
@@ -92,19 +92,19 @@ func memtest3() {
|
||||
ns.Autoreleasepool(func() {
|
||||
arr := ns.NSMutableArrayAlloc().Init()
|
||||
arr.Autorelease()
|
||||
arr.AddObject(ns.NSStringWithGoString(fmt.Sprintf("my string %d",i)))
|
||||
s1 := ns.NSStringWithGoString(fmt.Sprintf("my other string %d",i))
|
||||
fmt.Printf("%s\n",arr.ObjectAtIndex(0).NSString())
|
||||
arr.AddObject(ns.NSStringWithGoString(fmt.Sprintf("my string %d", i)))
|
||||
s1 := ns.NSStringWithGoString(fmt.Sprintf("my other string %d", i))
|
||||
fmt.Printf("%s\n", arr.ObjectAtIndex(0).NSString())
|
||||
_ = s1
|
||||
|
||||
for x := 0; x < 3; x++ {
|
||||
ns.Autoreleasepool(func() {
|
||||
str := arr.ObjectAtIndex(0).NSString()
|
||||
fmt.Printf("%d->%s\n",x,str) // does not leak in an autorelease pool
|
||||
fmt.Printf("%d->%s\n", x, str) // does not leak in an autorelease pool
|
||||
time.Sleep(time.Second / 5)
|
||||
})
|
||||
}
|
||||
time.Sleep(time.Second/2)
|
||||
time.Sleep(time.Second / 2)
|
||||
i++
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
inputfiles:
|
||||
- /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h
|
||||
- /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h
|
||||
classes:
|
||||
- NSAutoreleasePool
|
||||
- NSArray
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
ns "git.wow.st/gmp/nswrap/examples/simple/ClassOne"
|
||||
)
|
||||
|
||||
func cb(super ns.ClassThreeSupermethods) ns.Int {
|
||||
func cb(self ns.ClassThree, super ns.ClassThreeSupermethods) ns.Int {
|
||||
fmt.Printf("In Go callback\n")
|
||||
return 0
|
||||
}
|
||||
|
||||
+27
-27
@@ -26,21 +26,21 @@ func incr() func(bool) (int, float64) {
|
||||
if b == 0 {
|
||||
return i, 0.0
|
||||
} else {
|
||||
return i, (b/float64(i)) * 100
|
||||
return i, (b / float64(i)) * 100
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
type tracker struct {
|
||||
add, drop func(*ns.Id)
|
||||
check func()
|
||||
i func(bool) (int, float64)
|
||||
check func()
|
||||
i func(bool) (int, float64)
|
||||
}
|
||||
|
||||
type record struct {
|
||||
ptr unsafe.Pointer
|
||||
ptr unsafe.Pointer
|
||||
goPtr *ns.Id
|
||||
when time.Time
|
||||
when time.Time
|
||||
}
|
||||
|
||||
func newTracker() (func(*ns.Id), func(*ns.Id), func()) {
|
||||
@@ -54,35 +54,35 @@ func newTracker() (func(*ns.Id), func(*ns.Id), func()) {
|
||||
select {
|
||||
case x := <-addch:
|
||||
mux.Lock()
|
||||
data = append(data,record{
|
||||
x.Ptr(),
|
||||
x,
|
||||
time.Now(),
|
||||
})
|
||||
data = append(data, record{
|
||||
x.Ptr(),
|
||||
x,
|
||||
time.Now(),
|
||||
})
|
||||
mux.Unlock()
|
||||
case x := <-dropch:
|
||||
mux.Lock()
|
||||
data = append(data,record{
|
||||
nil,
|
||||
x,
|
||||
time.Now(),
|
||||
})
|
||||
data = append(data, record{
|
||||
nil,
|
||||
x,
|
||||
time.Now(),
|
||||
})
|
||||
mux.Unlock()
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
add := func(x *ns.Id) {
|
||||
addch<- x
|
||||
addch <- x
|
||||
}
|
||||
drop := func(x *ns.Id) {
|
||||
dropch<- x
|
||||
dropch <- x
|
||||
}
|
||||
check := func() {
|
||||
live := map[unsafe.Pointer]*ns.Id{}
|
||||
bad := false
|
||||
mux.Lock()
|
||||
for _,r := range data {
|
||||
for _, r := range data {
|
||||
if r.ptr != nil {
|
||||
if live[r.ptr] != nil {
|
||||
fmt.Printf("COLLISION: %p & %p -> %p\n", r.goPtr, live[r.ptr], r.ptr)
|
||||
@@ -90,10 +90,10 @@ func newTracker() (func(*ns.Id), func(*ns.Id), func()) {
|
||||
}
|
||||
live[r.ptr] = r.goPtr
|
||||
} else {
|
||||
delete(live,r.ptr)
|
||||
delete(live, r.ptr)
|
||||
}
|
||||
}
|
||||
fmt.Printf("Checked %d records -- ",len(data))
|
||||
fmt.Printf("Checked %d records -- ", len(data))
|
||||
if bad {
|
||||
fmt.Printf("failed\n")
|
||||
} else {
|
||||
@@ -101,25 +101,25 @@ func newTracker() (func(*ns.Id), func(*ns.Id), func()) {
|
||||
}
|
||||
mux.Unlock()
|
||||
}
|
||||
return add,drop,check
|
||||
return add, drop, check
|
||||
}
|
||||
|
||||
func mkstrings(t tracker) {
|
||||
for {
|
||||
//fmt.Printf("main thread: %t\n",ns.NSThreadIsMainThread())
|
||||
x,b := t.i(false)
|
||||
str := fmt.Sprintf("string %d",x)
|
||||
x, b := t.i(false)
|
||||
str := fmt.Sprintf("string %d", x)
|
||||
s := ns.NSStringWithGoString(str)
|
||||
//t.add(&s.Id)
|
||||
for j := 0; j < 10; j++ {
|
||||
sout := s.String()
|
||||
if str != sout {
|
||||
_,b = t.i(true)
|
||||
_, b = t.i(true)
|
||||
fmt.Printf("%3.2f%% -- %d: '%s' '%s'\n", b, x, str, sout)
|
||||
}
|
||||
time.Sleep(time.Second/1000)
|
||||
time.Sleep(time.Second / 1000)
|
||||
}
|
||||
if x % 1000 == 0 {
|
||||
if x%1000 == 0 {
|
||||
fmt.Printf("%3.2f%% -- %s\n", b, time.Now().Format("03:04:05.000"))
|
||||
}
|
||||
//t.drop(&s.Id)
|
||||
@@ -145,7 +145,7 @@ func main() {
|
||||
go func() {
|
||||
for {
|
||||
runtime.GC()
|
||||
time.Sleep(time.Second/100)
|
||||
time.Sleep(time.Second / 100)
|
||||
}
|
||||
}()
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
inputfiles:
|
||||
- /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h
|
||||
- /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h
|
||||
classes:
|
||||
- NSString
|
||||
- NSThread
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"git.wow.st/gmp/nswrap/examples/subclass/ns"
|
||||
)
|
||||
|
||||
func c1release(self ns.C1, super ns.C1Supermethods) {
|
||||
fmt.Printf("c1release()\n")
|
||||
super.Release()
|
||||
fmt.Printf("c1release() done\n")
|
||||
}
|
||||
|
||||
func c2myMethod(self ns.C2) {
|
||||
fmt.Printf("c2myMethod()\n")
|
||||
}
|
||||
|
||||
func main() {
|
||||
fmt.Printf("Starting\n")
|
||||
|
||||
c1 := ns.C1Alloc()
|
||||
c1.ReleaseCallback(c1release)
|
||||
c1.Release()
|
||||
|
||||
c2 := ns.C2Alloc()
|
||||
c2.MyMethodCallback(c2myMethod)
|
||||
c2.Release()
|
||||
|
||||
fmt.Printf("Done\n")
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
package ns
|
||||
|
||||
|
||||
/*
|
||||
#cgo CFLAGS: -x objective-c -fno-objc-arc
|
||||
#cgo LDFLAGS: -framework Foundation
|
||||
#pragma clang diagnostic ignored "-Wformat-security"
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
|
||||
*/
|
||||
import "C"
|
||||
|
||||
import (
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
//export C1Dealloc
|
||||
func C1Dealloc(o unsafe.Pointer) {
|
||||
C1Mux.RLock()
|
||||
cb := C1Lookup[o].Dealloc
|
||||
C1Mux.RUnlock()
|
||||
if cb == nil { return }
|
||||
self := C1{}
|
||||
self.ptr = o
|
||||
super := C1Supermethods{
|
||||
self.SuperDealloc,
|
||||
self.SuperRelease,
|
||||
}
|
||||
cb(self, super)
|
||||
}
|
||||
|
||||
//export C1Release
|
||||
func C1Release(o unsafe.Pointer) {
|
||||
C1Mux.RLock()
|
||||
cb := C1Lookup[o].Release
|
||||
C1Mux.RUnlock()
|
||||
if cb == nil { return }
|
||||
self := C1{}
|
||||
self.ptr = o
|
||||
super := C1Supermethods{
|
||||
self.SuperDealloc,
|
||||
self.SuperRelease,
|
||||
}
|
||||
cb(self, super)
|
||||
}
|
||||
|
||||
//export C2MyMethod
|
||||
func C2MyMethod(o unsafe.Pointer) {
|
||||
C2Mux.RLock()
|
||||
cb := C2Lookup[o].MyMethod
|
||||
C2Mux.RUnlock()
|
||||
if cb == nil { return }
|
||||
self := C2{}
|
||||
self.ptr = o
|
||||
cb(self)
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,26 @@
|
||||
inputfiles: [ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h ]
|
||||
classes:
|
||||
- NSObject
|
||||
- NSString
|
||||
subclasses:
|
||||
c1:
|
||||
NSObject:
|
||||
- dealloc
|
||||
- release
|
||||
c2:
|
||||
NSObject:
|
||||
- -(void)myMethod
|
||||
# c3:
|
||||
# NSObject:
|
||||
# - -(void)myMethod:(int)i
|
||||
# c4:
|
||||
# NSObject:
|
||||
# - release
|
||||
# - -(int)myMethod:(int)i
|
||||
# c5:
|
||||
# NSObject:
|
||||
# - release
|
||||
# - -(void)myMethod
|
||||
|
||||
frameworks: [ Foundation ]
|
||||
pragma: [ clang diagnostic ignored "-Wformat-security" ]
|
||||
Executable
BIN
Binary file not shown.
Reference in New Issue
Block a user