Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

store frame link list to interp.frames #172

Closed
wants to merge 1 commit into from
Closed

store frame link list to interp.frames #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 31 additions & 30 deletions interp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ type Interp struct {
funcs map[*ssa.Function]*function // ssa.Function -> *function
msets map[reflect.Type](map[string]*ssa.Function) // user defined type method sets
chexit chan int // call os.Exit code by chan for runtime.Goexit
deferMap sync.Map // defer goroutine id -> call frame
frames sync.Map // goroutine id -> call frame
rfuncMap sync.Map // reflect.Value(fn).Pointer -> *function
typesMutex sync.RWMutex // findType/toType mutex
mainid int64 // main goroutine id
Expand Down Expand Up @@ -155,9 +155,14 @@ func (i *Interp) findType(rt reflect.Type, local bool) (types.Type, bool) {

func (i *Interp) tryDeferFrame() *frame {
if atomic.LoadInt32(&i.deferCount) != 0 {
if f, ok := i.deferMap.Load(goroutineID()); ok {
return f.(*frame)
}
return i.currentFrame()
}
return nil
}

func (i *Interp) currentFrame() *frame {
if f, ok := i.frames.Load(goroutineID()); ok {
return f.(*frame).currentFrame()
}
return nil
}
Expand Down Expand Up @@ -200,14 +205,23 @@ type deferred struct {

type frame struct {
caller *frame
next *frame
pfn *function
defers *deferred
panicking *panicking
block *ssa.BasicBlock
stack []value // result args env datas
pc int
pred int
deferid int64
gid int64
}

func (fr *frame) currentFrame() (cur *frame) {
cur = fr
for cur.next != nil {
cur = cur.next
}
return cur
}

func (fr *frame) setReg(ir register, v value) {
Expand Down Expand Up @@ -336,14 +350,10 @@ func (fr *frame) runDefer(d *deferred) {
func (fr *frame) runDefers() {
interp := fr.pfn.Interp
atomic.AddInt32(&interp.deferCount, 1)
fr.deferid = goroutineID()
interp.deferMap.Store(fr.deferid, fr)
for d := fr.defers; d != nil; d = d.tail {
fr.runDefer(d)
}
interp.deferMap.Delete(fr.deferid)
atomic.AddInt32(&interp.deferCount, -1)
fr.deferid = 0
// runtime.Goexit() fr.panic == nil
if fr.panicking != nil {
panic(fr.panicking.value) // new panic, or still panicking
Expand Down Expand Up @@ -514,7 +524,7 @@ func (i *Interp) callFunction(caller *frame, pfn *function, args []value, env []
} else if pfn.nres > 1 {
result = tuple(fr.stack[0:pfn.nres])
}
pfn.deleteFrame(fr)
pfn.deleteFrame(fr, caller)
return
}

Expand All @@ -538,7 +548,7 @@ func (i *Interp) callFunctionByReflect(caller *frame, typ reflect.Type, pfn *fun
}
}
}
pfn.deleteFrame(fr)
pfn.deleteFrame(fr, caller)
return
}

Expand All @@ -551,7 +561,7 @@ func (i *Interp) callFunctionDiscardsResult(caller *frame, pfn *function, args [
fr.stack[pfn.narg+i+pfn.nres] = env[i]
}
fr.run()
pfn.deleteFrame(fr)
pfn.deleteFrame(fr, caller)
}

func (i *Interp) callFunctionByStack0(caller *frame, pfn *function, ir register, ia []register) {
Expand All @@ -560,7 +570,7 @@ func (i *Interp) callFunctionByStack0(caller *frame, pfn *function, ir register,
fr.stack[i] = caller.reg(ia[i])
}
fr.run()
pfn.deleteFrame(fr)
pfn.deleteFrame(fr, caller)
}

func (i *Interp) callFunctionByStack1(caller *frame, pfn *function, ir register, ia []register) {
Expand All @@ -570,7 +580,7 @@ func (i *Interp) callFunctionByStack1(caller *frame, pfn *function, ir register,
}
fr.run()
caller.setReg(ir, fr.stack[0])
pfn.deleteFrame(fr)
pfn.deleteFrame(fr, caller)
}

func (i *Interp) callFunctionByStackN(caller *frame, pfn *function, ir register, ia []register) {
Expand All @@ -580,7 +590,7 @@ func (i *Interp) callFunctionByStackN(caller *frame, pfn *function, ir register,
}
fr.run()
caller.setReg(ir, tuple(fr.stack[0:pfn.nres]))
pfn.deleteFrame(fr)
pfn.deleteFrame(fr, caller)
}

func (i *Interp) callFunctionByStack(caller *frame, pfn *function, ir register, ia []register) {
Expand All @@ -594,7 +604,7 @@ func (i *Interp) callFunctionByStack(caller *frame, pfn *function, ir register,
} else if pfn.nres > 1 {
caller.setReg(ir, tuple(fr.stack[0:pfn.nres]))
}
pfn.deleteFrame(fr)
pfn.deleteFrame(fr, caller)
}

func (i *Interp) callFunctionByStackNoRecover0(caller *frame, pfn *function, ir register, ia []register) {
Expand All @@ -607,7 +617,7 @@ func (i *Interp) callFunctionByStackNoRecover0(caller *frame, pfn *function, ir
fr.pc++
fn(fr)
}
pfn.deleteFrame(fr)
pfn.deleteFrame(fr, caller)
}

func (i *Interp) callFunctionByStackNoRecover1(caller *frame, pfn *function, ir register, ia []register) {
Expand All @@ -621,7 +631,7 @@ func (i *Interp) callFunctionByStackNoRecover1(caller *frame, pfn *function, ir
fn(fr)
}
caller.setReg(ir, fr.stack[0])
pfn.deleteFrame(fr)
pfn.deleteFrame(fr, caller)
}

func (i *Interp) callFunctionByStackNoRecoverN(caller *frame, pfn *function, ir register, ia []register) {
Expand All @@ -635,7 +645,7 @@ func (i *Interp) callFunctionByStackNoRecoverN(caller *frame, pfn *function, ir
fn(fr)
}
caller.setReg(ir, tuple(fr.stack[0:pfn.nres]))
pfn.deleteFrame(fr)
pfn.deleteFrame(fr, caller)
}

func (i *Interp) callFunctionByStackWithEnv(caller *frame, pfn *function, ir register, ia []register, env []value) {
Expand All @@ -652,7 +662,7 @@ func (i *Interp) callFunctionByStackWithEnv(caller *frame, pfn *function, ir reg
} else if pfn.nres > 1 {
caller.setReg(ir, tuple(fr.stack[0:pfn.nres]))
}
pfn.deleteFrame(fr)
pfn.deleteFrame(fr, caller)
}

func (i *Interp) callFunctionByStackNoRecoverWithEnv(caller *frame, pfn *function, ir register, ia []register, env []value) {
Expand All @@ -673,13 +683,10 @@ func (i *Interp) callFunctionByStackNoRecoverWithEnv(caller *frame, pfn *functio
} else if pfn.nres > 1 {
caller.setReg(ir, tuple(fr.stack[0:pfn.nres]))
}
pfn.deleteFrame(fr)
pfn.deleteFrame(fr, caller)
}

func (i *Interp) callExternal(caller *frame, fn reflect.Value, args []value, env []value) value {
if caller != nil && caller.deferid != 0 {
i.deferMap.Store(caller.deferid, caller)
}
var ins []reflect.Value
typ := fn.Type()
isVariadic := fn.Type().IsVariadic()
Expand Down Expand Up @@ -722,9 +729,6 @@ func (i *Interp) callExternal(caller *frame, fn reflect.Value, args []value, env
}
}
func (i *Interp) callExternalDiscardsResult(caller *frame, fn reflect.Value, args []value, env []value) {
if caller != nil && caller.deferid != 0 {
i.deferMap.Store(caller.deferid, caller)
}
var ins []reflect.Value
typ := fn.Type()
isVariadic := fn.Type().IsVariadic()
Expand Down Expand Up @@ -752,9 +756,6 @@ func (i *Interp) callExternalDiscardsResult(caller *frame, fn reflect.Value, arg
}

func (i *Interp) callExternalByStack(caller *frame, fn reflect.Value, ir register, ia []register) {
if caller.deferid != 0 {
i.deferMap.Store(caller.deferid, caller)
}
var ins []reflect.Value
typ := fn.Type()
isVariadic := fn.Type().IsVariadic()
Expand Down
26 changes: 17 additions & 9 deletions opblock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ func (p *function) allocFrame(caller *frame) *frame {
var fr *frame
if atomic.LoadInt32(&p.cached) == 1 {
fr = p.pool.Get().(*frame)
fr.block = p.Main
fr.defers = nil
fr.panicking = nil
fr.pc = 0
fr.pred = 0
fr.next = nil
} else {
if atomic.AddInt32(&p.used, 1) > int32(p.Interp.ctx.callForPool) {
atomic.StoreInt32(&p.cached, 1)
Expand All @@ -129,22 +135,24 @@ func (p *function) allocFrame(caller *frame) *frame {
}
fr.caller = caller
if caller != nil {
fr.deferid = caller.deferid
}
if fr.pc == -1 {
fr.block = p.Main
fr.defers = nil
fr.panicking = nil
fr.pc = 0
fr.pred = 0
caller.next = fr
fr.gid = caller.gid
} else {
fr.gid = goroutineID()
p.Interp.frames.Store(fr.gid, fr)
}
return fr
}

func (p *function) deleteFrame(fr *frame) {
func (p *function) deleteFrame(fr *frame, caller *frame) {
if atomic.LoadInt32(&p.cached) == 1 {
p.pool.Put(fr)
}
if caller == nil {
p.Interp.frames.Delete(fr.gid)
} else {
caller.next = nil
}
fr = nil
}

Expand Down