f8cca26f3c
Reized the I/O buffers to align with the size of the kernel buffers with fifos and move the close aspect of the console to key off of the stdin closing. Fixes #3738 Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
116 lines
2.7 KiB
Go
116 lines
2.7 KiB
Go
/*
|
|
Copyright The containerd Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package shim
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"sync"
|
|
"syscall"
|
|
|
|
"github.com/containerd/console"
|
|
"github.com/containerd/fifo"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
type linuxPlatform struct {
|
|
epoller *console.Epoller
|
|
}
|
|
|
|
func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console, stdin, stdout, stderr string, wg *sync.WaitGroup) (console.Console, error) {
|
|
if p.epoller == nil {
|
|
return nil, errors.New("uninitialized epoller")
|
|
}
|
|
|
|
epollConsole, err := p.epoller.Add(console)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var cwg sync.WaitGroup
|
|
|
|
if stdin != "" {
|
|
in, err := fifo.OpenFifo(ctx, stdin, syscall.O_RDONLY, 0)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cwg.Add(1)
|
|
go func() {
|
|
cwg.Done()
|
|
bp := bufPool.Get().(*[]byte)
|
|
defer bufPool.Put(bp)
|
|
io.CopyBuffer(epollConsole, in, *bp)
|
|
// we need to shutdown epollConsole when pipe broken
|
|
epollConsole.Shutdown(p.epoller.CloseConsole)
|
|
epollConsole.Close()
|
|
}()
|
|
}
|
|
|
|
outw, err := fifo.OpenFifo(ctx, stdout, syscall.O_WRONLY, 0)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
outr, err := fifo.OpenFifo(ctx, stdout, syscall.O_RDONLY, 0)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
wg.Add(1)
|
|
cwg.Add(1)
|
|
go func() {
|
|
cwg.Done()
|
|
p := bufPool.Get().(*[]byte)
|
|
defer bufPool.Put(p)
|
|
io.CopyBuffer(outw, epollConsole, *p)
|
|
outw.Close()
|
|
outr.Close()
|
|
wg.Done()
|
|
}()
|
|
cwg.Wait()
|
|
return epollConsole, nil
|
|
}
|
|
|
|
func (p *linuxPlatform) ShutdownConsole(ctx context.Context, cons console.Console) error {
|
|
if p.epoller == nil {
|
|
return errors.New("uninitialized epoller")
|
|
}
|
|
epollConsole, ok := cons.(*console.EpollConsole)
|
|
if !ok {
|
|
return errors.Errorf("expected EpollConsole, got %#v", cons)
|
|
}
|
|
return epollConsole.Shutdown(p.epoller.CloseConsole)
|
|
}
|
|
|
|
func (p *linuxPlatform) Close() error {
|
|
return p.epoller.Close()
|
|
}
|
|
|
|
// initialize a single epoll fd to manage our consoles. `initPlatform` should
|
|
// only be called once.
|
|
func (s *Service) initPlatform() error {
|
|
if s.platform != nil {
|
|
return nil
|
|
}
|
|
epoller, err := console.NewEpoller()
|
|
if err != nil {
|
|
return errors.Wrap(err, "failed to initialize epoller")
|
|
}
|
|
s.platform = &linuxPlatform{
|
|
epoller: epoller,
|
|
}
|
|
go epoller.Wait()
|
|
return nil
|
|
}
|