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

Fix #382 #391

Merged
merged 1 commit into from
Dec 16, 2022
Merged

Fix #382 #391

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
48 changes: 22 additions & 26 deletions rpc/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,27 +98,25 @@ func (ic *importClient) Send(ctx context.Context, s capnp.Send) (*capnp.Answer,
q := ic.c.newQuestion(s.Method)

// Send call message.
syncutil.Without(&ic.c.lk, func() {
ic.c.sendMessage(ctx, func(m rpccp.Message) error {
return ic.c.newImportCallMessage(m, ic.id, q.id, s)
}, func(err error) {
if err != nil {
syncutil.With(&ic.c.lk, func() {
ic.c.lk.questions[q.id] = nil
})
q.p.Reject(rpcerr.Failedf("send message: %w", err))
syncutil.With(&ic.c.lk, func() {
ic.c.lk.questionID.remove(uint32(q.id))
})
return
}

q.c.tasks.Add(1)
go func() {
defer q.c.tasks.Done()
q.handleCancel(ctx)
}()
})
ic.c.sendMessage(ctx, func(m rpccp.Message) error {
return ic.c.newImportCallMessage(m, ic.id, q.id, s)
}, func(err error) {
if err != nil {
syncutil.With(&ic.c.lk, func() {
ic.c.lk.questions[q.id] = nil
})
q.p.Reject(rpcerr.Failedf("send message: %w", err))
syncutil.With(&ic.c.lk, func() {
ic.c.lk.questionID.remove(uint32(q.id))
})
return
}

q.c.tasks.Add(1)
go func() {
defer q.c.tasks.Done()
q.handleCancel(ctx)
}()
})

ans := q.p.Answer()
Expand All @@ -131,7 +129,7 @@ func (ic *importClient) Send(ctx context.Context, s capnp.Send) (*capnp.Answer,

// newImportCallMessage builds a Call message targeted to an import.
//
// The caller MUST NOT hold c.mu.
// The caller MUST hold c.mu.
func (c *Conn) newImportCallMessage(msg rpccp.Message, imp importID, qid questionID, s capnp.Send) error {
call, err := msg.NewCall()
if err != nil {
Expand Down Expand Up @@ -163,10 +161,8 @@ func (c *Conn) newImportCallMessage(msg rpccp.Message, imp importID, qid questio
if err := s.PlaceArgs(args); err != nil {
return rpcerr.Failedf("place arguments: %w", err)
}
syncutil.With(&c.lk, func() {
// TODO(soon): save param refs
_, err = c.fillPayloadCapTable(payload)
})
// TODO(soon): save param refs
_, err = c.fillPayloadCapTable(payload)
if err != nil {
return rpcerr.Annotatef(err, "build call message")
}
Expand Down
50 changes: 23 additions & 27 deletions rpc/question.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,28 +151,26 @@ func (q *question) PipelineSend(ctx context.Context, transform []capnp.PipelineO
q.mark(transform)
q2 := q.c.newQuestion(s.Method)

syncutil.Without(&q.c.lk, func() {
// Send call message.
q.c.sendMessage(ctx, func(m rpccp.Message) error {
return q.c.newPipelineCallMessage(m, q.id, transform, q2.id, s)
}, func(err error) {
if err != nil {
syncutil.With(&q.c.lk, func() {
q.c.lk.questions[q2.id] = nil
})
q2.p.Reject(rpcerr.Failedf("send message: %w", err))
syncutil.With(&q.c.lk, func() {
q.c.lk.questionID.remove(uint32(q2.id))
})
return
}

q2.c.tasks.Add(1)
go func() {
defer q2.c.tasks.Done()
q2.handleCancel(ctx)
}()
})
// Send call message.
q.c.sendMessage(ctx, func(m rpccp.Message) error {
return q.c.newPipelineCallMessage(m, q.id, transform, q2.id, s)
}, func(err error) {
if err != nil {
syncutil.With(&q.c.lk, func() {
q.c.lk.questions[q2.id] = nil
})
q2.p.Reject(rpcerr.Failedf("send message: %w", err))
syncutil.With(&q.c.lk, func() {
q.c.lk.questionID.remove(uint32(q2.id))
})
return
}

q2.c.tasks.Add(1)
go func() {
defer q2.c.tasks.Done()
q2.handleCancel(ctx)
}()
})

ans := q2.p.Answer()
Expand All @@ -185,7 +183,7 @@ func (q *question) PipelineSend(ctx context.Context, transform []capnp.PipelineO

// newPipelineCallMessage builds a Call message targeted to a promised answer..
//
// The caller MUST NOT hold c.mu.
// The caller MUST hold c.mu.
func (c *Conn) newPipelineCallMessage(msg rpccp.Message, tgt questionID, transform []capnp.PipelineOp, qid questionID, s capnp.Send) error {
call, err := msg.NewCall()
if err != nil {
Expand Down Expand Up @@ -230,10 +228,8 @@ func (c *Conn) newPipelineCallMessage(msg rpccp.Message, tgt questionID, transfo
if err := s.PlaceArgs(args); err != nil {
return rpcerr.Failedf("place arguments: %w", err)
}
syncutil.With(&c.lk, func() {
// TODO(soon): save param refs
_, err = c.fillPayloadCapTable(payload)
})
// TODO(soon): save param refs
_, err = c.fillPayloadCapTable(payload)

if err != nil {
return rpcerr.Annotatef(err, "build call message")
Expand Down