Make sys.args accurate and implement -cpuprofile flag

ncw · ncw · commit f86372376ff8 · 2015-05-31T13:59:53.000+01:00
diff --git a/main.go b/main.go
@@ -5,6 +5,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"runtime/pprof"
 
 	_ "github.com/ncw/gpython/builtin"
 	"github.com/ncw/gpython/repl"
@@ -17,15 +18,16 @@ import (
 	"github.com/ncw/gpython/compile"
 	"github.com/ncw/gpython/marshal"
 	"github.com/ncw/gpython/py"
-	_ "github.com/ncw/gpython/sys"
+	pysys "github.com/ncw/gpython/sys"
 	_ "github.com/ncw/gpython/time"
 	"github.com/ncw/gpython/vm"
 )
 
 // Globals
 var (
 	// Flags
-	debug = flag.Bool("d", false, "Print lots of debugging")
+	debug      = flag.Bool("d", false, "Print lots of debugging")
+	cpuprofile = flag.String("cpuprofile", "", "Write cpu profile to file")
 )
 
 // syntaxError prints the syntax
@@ -53,13 +55,26 @@ func main() {
 	flag.Usage = syntaxError
 	flag.Parse()
 	args := flag.Args()
+	py.MustGetModule("sys").Globals["argv"] = pysys.MakeArgv(args)
 	if len(args) == 0 {
 		repl.Run()
 		return
 	}
 	prog := args[0]
 	fmt.Printf("Running %q\n", prog)
 
+	if *cpuprofile != "" {
+		f, err := os.Create(*cpuprofile)
+		if err != nil {
+			log.Fatal(err)
+		}
+		err = pprof.StartCPUProfile(f)
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer pprof.StopCPUProfile()
+	}
+
 	// FIXME should be using ImportModuleLevelObject() here
 	f, err := os.Open(prog)
 	if err != nil {
diff --git a/notes.txt b/notes.txt
@@ -4,9 +4,19 @@ Code Quality
   * errchk ./...
   * go vet ./...
 
+Limitations
+===========
+  * string keys only in dictionaries
+  * ints only 64 bit
+
 Todo
 ====
 
+Speedup
+  * Make Object a fat interface so it defines all the M__method__ or at least all the common ones
+  * Make the methods be pointers in *Type more like python
+
+
   * Getting rid of panic/defer error handling
 
 Speed 35% improvement
diff --git a/py/module.go b/py/module.go
@@ -64,6 +64,24 @@ func NewModule(name, doc string, methods []*Method, globals StringDict) *Module
 	return m
 }
 
+// Gets a module
+func GetModule(name string) (*Module, error) {
+	m, ok := modules[name]
+	if !ok {
+		return nil, ExceptionNewf(ImportError, "Module %q not found", name)
+	}
+	return m, nil
+}
+
+// Gets a module or panics
+func MustGetModule(name string) *Module {
+	m, err := GetModule(name)
+	if err != nil {
+		panic(err)
+	}
+	return m
+}
+
 // Calls a named method of a module
 func (m *Module) Call(name string, args Tuple, kwargs StringDict) (Object, error) {
 	attr, err := GetAttrString(m, name)
diff --git a/sys/sys.go b/sys/sys.go
@@ -648,11 +648,7 @@ func init() {
 		py.MustNewMethod("call_tracing", sys_call_tracing, 0, call_tracing_doc),
 		py.MustNewMethod("_debugmallocstats", sys_debugmallocstats, 0, debugmallocstats_doc),
 	}
-	pyargs := os.Args[1:]
-	argv := py.NewListSized(len(pyargs))
-	for i, v := range pyargs {
-		argv.Items[i] = py.String(v)
-	}
+	argv := MakeArgv(os.Args[1:])
 	stdin, stdout, stderr := (*py.File)(os.Stdin), (*py.File)(os.Stdout), (*py.File)(os.Stderr)
 	globals := py.StringDict{
 		"argv":       argv,
@@ -787,3 +783,12 @@ func init() {
 	}
 	py.NewModule("sys", module_doc, methods, globals)
 }
+
+// Makes an argv into a tuple
+func MakeArgv(pyargs []string) py.Object {
+	argv := py.NewListSized(len(pyargs))
+	for i, v := range pyargs {
+		argv.Items[i] = py.String(v)
+	}
+	return argv
+}
