From 1bb8f19f5e9016a9eb118b8aba2b5689b4505812 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Sat, 3 Oct 2009 10:37:12 -0700 Subject: 8c, 8l dynamic loading support. better mach binaries. cgo working on darwin+linux amd64+386. eliminated context switches - pi is 30x faster. add libcgo to build. on snow leopard: - non-cgo binaries work; all tests pass. - cgo binaries work on amd64 but not 386. R=r DELTA=2031 (1316 added, 626 deleted, 89 changed) OCL=35264 CL=35304 --- misc/cgo/gmp/Makefile | 21 +++++++--- misc/cgo/gmp/fib.go | 43 ++++++++++++++++++++ misc/cgo/gmp/pi.go | 104 +++++++++++++++++++++++++++++++++++++++++++++++ misc/cgo/gmp/pidigits.go | 104 ----------------------------------------------- misc/cgo/stdio/Makefile | 17 ++++++++ misc/cgo/stdio/fib.go | 47 +++++++++++++++++++++ misc/cgo/stdio/file.go | 43 ++++++++++++++++++++ misc/cgo/stdio/hello.go | 12 ++++++ 8 files changed, 281 insertions(+), 110 deletions(-) create mode 100644 misc/cgo/gmp/fib.go create mode 100644 misc/cgo/gmp/pi.go delete mode 100644 misc/cgo/gmp/pidigits.go create mode 100644 misc/cgo/stdio/Makefile create mode 100644 misc/cgo/stdio/fib.go create mode 100644 misc/cgo/stdio/file.go create mode 100644 misc/cgo/stdio/hello.go (limited to 'misc/cgo') diff --git a/misc/cgo/gmp/Makefile b/misc/cgo/gmp/Makefile index b261ff235..c92458c90 100644 --- a/misc/cgo/gmp/Makefile +++ b/misc/cgo/gmp/Makefile @@ -5,6 +5,9 @@ include $(GOROOT)/src/Make.$(GOARCH) TARG=gmp + +# Can have plain GOFILES too, but this example doesn't. + CGOFILES=\ gmp.go @@ -15,15 +18,21 @@ CGO_LDFLAGS=-lgmp # alternate installation of the library: # CGO_CFLAGS=-I/home/rsc/gmp32/include # CGO_LDFLAGS+=-L/home/rsc/gmp32/lib +# Note the += on the second line. -# Can have plain GOFILES too, but this example doesn't. +CLEANFILES+=pi fib include $(GOROOT)/src/Make.pkg -# Simple test program +# Simple test programs + +# Computes 1000 digits of pi; single-threaded. +pi: install pi.go + $(GC) pi.go + $(LD) -o $@ pi.$O -pidigits.$O: install pidigits.go - $(GC) pidigits.go +# Computes 200 Fibonacci numbers; multi-threaded. +fib: install fib.go + $(GC) fib.go + $(LD) -o $@ fib.$O -pidigits: pidigits.$O - $(LD) -o $@ pidigits.$O diff --git a/misc/cgo/gmp/fib.go b/misc/cgo/gmp/fib.go new file mode 100644 index 000000000..02b98b108 --- /dev/null +++ b/misc/cgo/gmp/fib.go @@ -0,0 +1,43 @@ +// Copyright 2009 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Compute Fibonacci numbers with two goroutines +// that pass integers back and forth. No actual +// concurrency, just threads and synchronization +// and foreign code on multiple pthreads. + +package main + +import ( + big "gmp"; + "runtime"; +) + +func fibber(c chan *big.Int, out chan string, n int64) { + // Keep the fibbers in dedicated operating system + // threads, so that this program tests coordination + // between pthreads and not just goroutines. + runtime.LockOSThread(); + + i := big.NewInt(n); + if n == 0 { + c <- i; + } + for { + j := <-c; + out <- j.String(); + i.Add(i, j); + c <- i; + } +} + +func main() { + c := make(chan *big.Int); + out := make(chan string); + go fibber(c, out, 0); + go fibber(c, out, 1); + for i := 0; i < 200; i++ { + println(<-out); + } +} diff --git a/misc/cgo/gmp/pi.go b/misc/cgo/gmp/pi.go new file mode 100644 index 000000000..d22bbc653 --- /dev/null +++ b/misc/cgo/gmp/pi.go @@ -0,0 +1,104 @@ +/* +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of "The Computer Language Benchmarks Game" nor the + name of "The Computer Language Shootout Benchmarks" nor the names of + its contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. +*/ + +/* The Computer Language Benchmarks Game + * http://shootout.alioth.debian.org/ + * + * contributed by The Go Authors. + * based on pidigits.c (by Paolo Bonzini & Sean Bartlett, + * modified by Michael Mellor) + */ + +package main + +import ( + big "gmp"; + "fmt"; + "runtime"; +) + +var ( + tmp1 = big.NewInt(0); + tmp2 = big.NewInt(0); + numer = big.NewInt(1); + accum = big.NewInt(0); + denom = big.NewInt(1); + ten = big.NewInt(10); +) + +func extractDigit() int64 { + if big.CmpInt(numer, accum) > 0 { + return -1; + } + tmp1.Lsh(numer, 1).Add(tmp1, numer).Add(tmp1, accum); + big.DivModInt(tmp1, tmp2, tmp1, denom); + tmp2.Add(tmp2, numer); + if big.CmpInt(tmp2, denom) >= 0 { + return -1; + } + return tmp1.Int64(); +} + +func nextTerm(k int64) { + y2 := k*2 + 1; + accum.Add(accum, tmp1.Lsh(numer, 1)); + accum.Mul(accum, tmp1.SetInt64(y2)); + numer.Mul(numer, tmp1.SetInt64(k)); + denom.Mul(denom, tmp1.SetInt64(y2)); +} + +func eliminateDigit(d int64) { + accum.Sub(accum, tmp1.Mul(denom, tmp1.SetInt64(d))); + accum.Mul(accum, ten); + numer.Mul(numer, ten); +} + +func main() { + i := 0; + k := int64(0); + for { + d := int64(-1); + for d < 0 { + k++; + nextTerm(k); + d = extractDigit(); + } + eliminateDigit(d); + fmt.Printf("%c", d + '0'); + + if i++; i%50 == 0 { + fmt.Printf("\n"); + if i >= 1000 { + break; + } + } + } + + fmt.Printf("\n%d calls; bit sizes: %d %d %d\n", runtime.Cgocalls(), numer.Len(), accum.Len(), denom.Len()); +} diff --git a/misc/cgo/gmp/pidigits.go b/misc/cgo/gmp/pidigits.go deleted file mode 100644 index d22bbc653..000000000 --- a/misc/cgo/gmp/pidigits.go +++ /dev/null @@ -1,104 +0,0 @@ -/* -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of "The Computer Language Benchmarks Game" nor the - name of "The Computer Language Shootout Benchmarks" nor the names of - its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. -*/ - -/* The Computer Language Benchmarks Game - * http://shootout.alioth.debian.org/ - * - * contributed by The Go Authors. - * based on pidigits.c (by Paolo Bonzini & Sean Bartlett, - * modified by Michael Mellor) - */ - -package main - -import ( - big "gmp"; - "fmt"; - "runtime"; -) - -var ( - tmp1 = big.NewInt(0); - tmp2 = big.NewInt(0); - numer = big.NewInt(1); - accum = big.NewInt(0); - denom = big.NewInt(1); - ten = big.NewInt(10); -) - -func extractDigit() int64 { - if big.CmpInt(numer, accum) > 0 { - return -1; - } - tmp1.Lsh(numer, 1).Add(tmp1, numer).Add(tmp1, accum); - big.DivModInt(tmp1, tmp2, tmp1, denom); - tmp2.Add(tmp2, numer); - if big.CmpInt(tmp2, denom) >= 0 { - return -1; - } - return tmp1.Int64(); -} - -func nextTerm(k int64) { - y2 := k*2 + 1; - accum.Add(accum, tmp1.Lsh(numer, 1)); - accum.Mul(accum, tmp1.SetInt64(y2)); - numer.Mul(numer, tmp1.SetInt64(k)); - denom.Mul(denom, tmp1.SetInt64(y2)); -} - -func eliminateDigit(d int64) { - accum.Sub(accum, tmp1.Mul(denom, tmp1.SetInt64(d))); - accum.Mul(accum, ten); - numer.Mul(numer, ten); -} - -func main() { - i := 0; - k := int64(0); - for { - d := int64(-1); - for d < 0 { - k++; - nextTerm(k); - d = extractDigit(); - } - eliminateDigit(d); - fmt.Printf("%c", d + '0'); - - if i++; i%50 == 0 { - fmt.Printf("\n"); - if i >= 1000 { - break; - } - } - } - - fmt.Printf("\n%d calls; bit sizes: %d %d %d\n", runtime.Cgocalls(), numer.Len(), accum.Len(), denom.Len()); -} diff --git a/misc/cgo/stdio/Makefile b/misc/cgo/stdio/Makefile new file mode 100644 index 000000000..010e17974 --- /dev/null +++ b/misc/cgo/stdio/Makefile @@ -0,0 +1,17 @@ +# Copyright 2009 The Go Authors. All rights reserved. +# Use of this source code is governed by a BSD-style +# license that can be found in the LICENSE file. + +include $(GOROOT)/src/Make.$(GOARCH) + +TARG=stdio +CGOFILES=\ + file.go + +CLEANFILES+=hello fib chain + +include $(GOROOT)/src/Make.pkg + +%: install %.go + $(GC) $*.go + $(LD) -o $@ $*.$O diff --git a/misc/cgo/stdio/fib.go b/misc/cgo/stdio/fib.go new file mode 100644 index 000000000..972057e11 --- /dev/null +++ b/misc/cgo/stdio/fib.go @@ -0,0 +1,47 @@ +// Copyright 2009 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Compute Fibonacci numbers with two goroutines +// that pass integers back and forth. No actual +// concurrency, just threads and synchronization +// and foreign code on multiple pthreads. + +package main + +import ( + "runtime"; + "stdio"; + "strconv"; +) + +func fibber(c, out chan int64, i int64) { + // Keep the fibbers in dedicated operating system + // threads, so that this program tests coordination + // between pthreads and not just goroutines. + runtime.LockOSThread(); + + if i == 0 { + c <- i; + } + for { + j := <-c; + stdio.Puts(strconv.Itoa64(j)); + out <- j; + <-out; + i += j; + c <- i; + } +} + +func main() { + c := make(chan int64); + out := make(chan int64); + go fibber(c, out, 0); + go fibber(c, out, 1); + <-out; + for i := 0; i < 90; i++ { + out <- 1; + <-out; + } +} diff --git a/misc/cgo/stdio/file.go b/misc/cgo/stdio/file.go new file mode 100644 index 000000000..7935f8f4d --- /dev/null +++ b/misc/cgo/stdio/file.go @@ -0,0 +1,43 @@ +// Copyright 2009 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +/* +A trivial example of wrapping a C library in Go. +For a more complex example and explanation, +see ../gmp/gmp.go. +*/ + +package stdio + +// TODO(rsc): Remove fflushstdout when C.fflush(C.stdout) works in cgo. + +/* +#include +#include + +void fflushstdout(void) { fflush(stdout); } +*/ +import "C" +import "unsafe" + +/* +type File C.FILE + +var Stdout = (*File)(C.stdout) +var Stderr = (*File)(C.stderr) + +func (f *File) WriteString(s string) { + p := C.CString(s); + C.fputs(p, (*C.FILE)(f)); + C.free(p); +} +*/ + +func Puts(s string) { + p := C.CString(s); + C.puts(p); + C.free(unsafe.Pointer(p)); + C.fflushstdout(); +} + diff --git a/misc/cgo/stdio/hello.go b/misc/cgo/stdio/hello.go new file mode 100644 index 000000000..8809c9a9c --- /dev/null +++ b/misc/cgo/stdio/hello.go @@ -0,0 +1,12 @@ +// Copyright 2009 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package main + +import "stdio" + +func main() { +// stdio.Stdout.WriteString("hello, world\n"); + stdio.Puts("hello, world"); +} -- cgit v1.2.3