qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 10:20:01 -07:00
Code Releases Activity

rpc and exp/template: simplify tests for exported items

Browse Source 
Fix code to count mallocs - needed to call UpdateMemStats.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/4823055
This commit is contained in:
Rob Pike 2011-07-27 21:26:16 -07:00
parent a65f4ccb89
commit 5a52c6ad29
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pkg/exp/template/exec.go
View File

@ -10,8 +10,6 @@ import (
"os" "os"
"reflect" "reflect"
"strings" "strings"
"unicode"
"utf8"
) )
// state represents the state of an execution. It's not part of the // state represents the state of an execution. It's not part of the
@ -356,12 +354,6 @@ func (s *state) evalFunction(dot reflect.Value, name string, args []node, final
return s.evalCall(dot, function, name, args, final) return s.evalCall(dot, function, name, args, final)
} }
// Is this an exported - upper case - name?
func isExported(name string) bool {
rune, _ := utf8.DecodeRuneInString(name)
return unicode.IsUpper(rune)
}
// evalField evaluates an expression like (.Field) or (.Field arg1 arg2). // evalField evaluates an expression like (.Field) or (.Field arg1 arg2).
// The 'final' argument represents the return value from the preceding // The 'final' argument represents the return value from the preceding
// value of the pipeline, if any. // value of the pipeline, if any.
@ -383,12 +375,13 @@ func (s *state) evalField(dot reflect.Value, fieldName string, args []node, fina
// It's not a method; is it a field of a struct? // It's not a method; is it a field of a struct?
receiver, isNil := indirect(receiver) receiver, isNil := indirect(receiver)
if receiver.Kind() == reflect.Struct { if receiver.Kind() == reflect.Struct {
field := receiver.FieldByName(fieldName) tField, ok := receiver.Type().FieldByName(fieldName)
if field.IsValid() { if ok {
field := receiver.FieldByIndex(tField.Index)
if len(args) > 1 || final.IsValid() { if len(args) > 1 || final.IsValid() {
s.errorf("%s is not a method but has arguments", fieldName) s.errorf("%s is not a method but has arguments", fieldName)
} }
if isExported(fieldName) { // valid and exported if tField.PkgPath == "" { // field is exported
return field return field
} }
} }

16
src/pkg/rpc/server.go
View File

@ -196,12 +196,14 @@ func isExported(name string) bool {
return unicode.IsUpper(rune) return unicode.IsUpper(rune)
} }
// Is this type exported or local to this package? // Is this type exported or a builtin?
func isExportedOrLocalType(t reflect.Type) bool { func isExportedOrBuiltinType(t reflect.Type) bool {
for t.Kind() == reflect.Ptr { for t.Kind() == reflect.Ptr {
t = t.Elem() t = t.Elem()
} }
return t.PkgPath() == "" || isExported(t.Name()) // PkgPath will be non-empty even for an exported type,
// so we need to check the type name as well.
return isExported(t.Name()) || t.PkgPath() == ""
} }
// Register publishes in the server the set of methods of the // Register publishes in the server the set of methods of the
@ -239,7 +241,7 @@ func (server *Server) register(rcvr interface{}, name string, useName bool) os.E
if sname == "" { if sname == "" {
log.Fatal("rpc: no service name for type", s.typ.String()) log.Fatal("rpc: no service name for type", s.typ.String())
} }
if s.typ.PkgPath() != "" && !isExported(sname) && !useName { if !isExported(sname) && !useName {
s := "rpc Register: type " + sname + " is not exported" s := "rpc Register: type " + sname + " is not exported"
log.Print(s) log.Print(s)
return os.NewError(s) return os.NewError(s)
@ -255,7 +257,7 @@ func (server *Server) register(rcvr interface{}, name string, useName bool) os.E
method := s.typ.Method(m) method := s.typ.Method(m)
mtype := method.Type mtype := method.Type
mname := method.Name mname := method.Name
if mtype.PkgPath() != "" || !isExported(mname) { if method.PkgPath != "" {
continue continue
} }
// Method needs three ins: receiver, *args, *reply. // Method needs three ins: receiver, *args, *reply.
@ -265,7 +267,7 @@ func (server *Server) register(rcvr interface{}, name string, useName bool) os.E
} }
// First arg need not be a pointer. // First arg need not be a pointer.
argType := mtype.In(1) argType := mtype.In(1)
if !isExportedOrLocalType(argType) { if !isExportedOrBuiltinType(argType) {
log.Println(mname, "argument type not exported or local:", argType) log.Println(mname, "argument type not exported or local:", argType)
continue continue
} }
@ -275,7 +277,7 @@ func (server *Server) register(rcvr interface{}, name string, useName bool) os.E
log.Println("method", mname, "reply type not a pointer:", replyType) log.Println("method", mname, "reply type not a pointer:", replyType)
continue continue
} }
if !isExportedOrLocalType(replyType) { if !isExportedOrBuiltinType(replyType) {
log.Println("method", mname, "reply type not exported or local:", replyType) log.Println("method", mname, "reply type not exported or local:", replyType)
continue continue
} }

2
src/pkg/rpc/server_test.go
View File

@ -360,6 +360,7 @@ func countMallocs(dial func() (*Client, os.Error), t *testing.T) uint64 {
} }
args := &Args{7, 8} args := &Args{7, 8}
reply := new(Reply) reply := new(Reply)
runtime.UpdateMemStats()
mallocs := 0 - runtime.MemStats.Mallocs mallocs := 0 - runtime.MemStats.Mallocs
const count = 100 const count = 100
for i := 0; i < count; i++ { for i := 0; i < count; i++ {
@ -371,6 +372,7 @@ func countMallocs(dial func() (*Client, os.Error), t *testing.T) uint64 {
t.Errorf("Add: expected %d got %d", reply.C, args.A+args.B) t.Errorf("Add: expected %d got %d", reply.C, args.A+args.B)
} }
} }
runtime.UpdateMemStats()
mallocs += runtime.MemStats.Mallocs mallocs += runtime.MemStats.Mallocs
return mallocs / count return mallocs / count
} }