From 76cf593212eea7033be72156029b670a9f0cf4b7 Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosbymichael@gmail.com>
Date: Tue, 15 Dec 2015 16:22:53 -0800
Subject: [PATCH] Add oom notifications and pid to create response

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
---
 api/grpc/server/server.go |  17 +++-
 api/grpc/types/api.pb.go  | 185 +++++++++++++++++++-------------------
 api/grpc/types/api.proto  |   1 +
 containerd/main.go        |   9 +-
 create.go                 |  13 +--
 ctr/container.go          |   5 +-
 event.go                  |  40 +++++----
 linux/linux.go            |   4 +
 oom.go                    |  80 +++++++++++++++++
 runc/runc.go              |   4 +
 runtime/container.go      |   2 +
 supervisor.go             |   6 +-
 worker.go                 |  31 +++++--
 13 files changed, 269 insertions(+), 128 deletions(-)
 create mode 100644 oom.go

diff --git a/api/grpc/server/server.go b/api/grpc/server/server.go
index 34e82c9..371fe71 100644
--- a/api/grpc/server/server.go
+++ b/api/grpc/server/server.go
@@ -37,6 +37,7 @@ func (s *apiServer) CreateContainer(ctx context.Context, c *types.CreateContaine
 	e.Stderr = c.Stderr
 	e.Stdin = c.Stdin
 	e.Console = c.Console
+	e.StartResponse = make(chan containerd.StartResponse, 1)
 	if c.Checkpoint != "" {
 		e.Checkpoint = &runtime.Checkpoint{
 			Name: c.Checkpoint,
@@ -46,7 +47,10 @@ func (s *apiServer) CreateContainer(ctx context.Context, c *types.CreateContaine
 	if err := <-e.Err; err != nil {
 		return nil, err
 	}
-	return &types.CreateContainerResponse{}, nil
+	sr := <-e.StartResponse
+	return &types.CreateContainerResponse{
+		Pid: uint32(sr.Pid),
+	}, nil
 }
 
 func (s *apiServer) Signal(ctx context.Context, r *types.SignalRequest) (*types.SignalResponse, error) {
@@ -223,18 +227,27 @@ func (s *apiServer) Events(r *types.EventsRequest, stream types.API_EventsServer
 	events := s.sv.Events()
 	defer s.sv.Unsubscribe(events)
 	for evt := range events {
+		var ev *types.Event
 		switch evt.Type {
 		case containerd.ExitEventType, containerd.ExecExitEventType:
-			ev := &types.Event{
+			ev = &types.Event{
 				Type:   "exit",
 				Id:     evt.ID,
 				Pid:    uint32(evt.Pid),
 				Status: uint32(evt.Status),
 			}
+		case containerd.OOMEventType:
+			ev = &types.Event{
+				Type: "oom",
+				Id:   evt.ID,
+			}
+		}
+		if ev != nil {
 			if err := stream.Send(ev); err != nil {
 				return err
 			}
 		}
+
 	}
 	return nil
 }
diff --git a/api/grpc/types/api.pb.go b/api/grpc/types/api.pb.go
index 4c63bd0..0455a8c 100644
--- a/api/grpc/types/api.pb.go
+++ b/api/grpc/types/api.pb.go
@@ -78,6 +78,7 @@ func (*CreateContainerRequest) ProtoMessage()               {}
 func (*CreateContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
 type CreateContainerResponse struct {
+	Pid uint32 `protobuf:"varint,1,opt,name=pid" json:"pid,omitempty"`
 }
 
 func (m *CreateContainerResponse) Reset()                    { *m = CreateContainerResponse{} }
@@ -1086,96 +1087,96 @@ var _API_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 1450 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0xe9, 0x6e, 0x1c, 0x45,
-	0x10, 0xf6, 0xee, 0xce, 0x5e, 0xb5, 0x87, 0xed, 0x71, 0xec, 0xac, 0x17, 0x42, 0x92, 0x21, 0x40,
-	0x84, 0x22, 0x2b, 0x38, 0x1c, 0x21, 0xfc, 0x80, 0xe0, 0x44, 0x09, 0x28, 0x01, 0x2b, 0xb1, 0x91,
-	0xf8, 0xc3, 0x6a, 0x3c, 0xd3, 0xac, 0x9b, 0x9d, 0x8b, 0x99, 0x1e, 0x1f, 0xaf, 0x80, 0x78, 0x1c,
-	0xc4, 0x03, 0x20, 0xf1, 0x9f, 0xe7, 0xe0, 0x29, 0xa8, 0x3e, 0xa6, 0xe7, 0xd8, 0xc3, 0xf0, 0x83,
-	0x3f, 0x2b, 0x75, 0x77, 0xd5, 0x57, 0x55, 0x5f, 0x1d, 0xd3, 0xbd, 0xd0, 0xb5, 0x23, 0xba, 0x17,
-	0xc5, 0x21, 0x0b, 0xcd, 0x26, 0xbb, 0x8c, 0x48, 0x62, 0xfd, 0x5a, 0x83, 0x9d, 0x83, 0x98, 0xd8,
-	0x8c, 0x1c, 0x84, 0x01, 0xb3, 0x69, 0x40, 0xe2, 0x57, 0xe4, 0xe7, 0x94, 0x24, 0xcc, 0x04, 0xa8,
-	0x53, 0x77, 0x54, 0xbb, 0x55, 0xbb, 0xdb, 0x35, 0x71, 0x71, 0x92, 0x06, 0xae, 0x47, 0x0e, 0x6d,
-	0x76, 0x3a, 0xaa, 0x8b, 0xbd, 0x01, 0x34, 0x13, 0xe6, 0xd2, 0x60, 0xd4, 0x10, 0xcb, 0x21, 0xb4,
-	0x70, 0x19, 0xa6, 0x6c, 0x64, 0x14, 0xd6, 0x24, 0x8e, 0x47, 0x4d, 0xb1, 0x5e, 0x87, 0xb6, 0x13,
-	0x06, 0x49, 0xe8, 0x91, 0x51, 0x2b, 0xc3, 0x74, 0x4e, 0x89, 0x33, 0x8b, 0x42, 0x1a, 0xb0, 0x51,
-	0x9b, 0xef, 0x59, 0xbb, 0x70, 0x7d, 0xce, 0x9b, 0x24, 0x42, 0x35, 0x62, 0x3d, 0x84, 0xc1, 0x6b,
-	0x3a, 0x0d, 0x6c, 0x6f, 0x91, 0x7f, 0x3d, 0x68, 0x44, 0xb8, 0xe0, 0x8e, 0x0d, 0x84, 0x65, 0x21,
-	0x29, 0x3c, 0x1b, 0x58, 0x1b, 0x30, 0xcc, 0x34, 0x15, 0xd6, 0x6f, 0x35, 0xd8, 0x7c, 0xec, 0xba,
-	0x87, 0x71, 0xe8, 0x90, 0x24, 0x59, 0x04, 0xb8, 0x01, 0x1d, 0x46, 0x62, 0x9f, 0x72, 0x14, 0x8e,
-	0xda, 0x31, 0x77, 0xc1, 0x48, 0x13, 0x12, 0x0b, 0xcc, 0xde, 0x7e, 0x6f, 0x4f, 0xf0, 0xb7, 0x77,
-	0x8c, 0x5b, 0x66, 0x1f, 0x0c, 0x3b, 0x9e, 0x26, 0x18, 0x78, 0x43, 0xfa, 0x42, 0x82, 0x33, 0x8c,
-	0x5a, 0x2d, 0x9c, 0x73, 0x57, 0x45, 0xac, 0x19, 0x6b, 0x57, 0x18, 0xeb, 0x54, 0x18, 0xeb, 0x56,
-	0x19, 0x03, 0xc1, 0xce, 0x43, 0x30, 0x84, 0x3d, 0x04, 0x4d, 0x95, 0xa7, 0x03, 0xbe, 0x98, 0xea,
-	0xd0, 0x77, 0x60, 0x68, 0xbb, 0x2e, 0x65, 0x34, 0x44, 0xc7, 0x9f, 0x51, 0x37, 0x41, 0x77, 0x1b,
-	0x48, 0xc1, 0x6d, 0x30, 0x8b, 0xf1, 0x4a, 0x1a, 0x32, 0xd6, 0x04, 0x8e, 0xf5, 0x42, 0x53, 0xaf,
-	0x93, 0xb2, 0x88, 0x98, 0x77, 0x4a, 0x59, 0xab, 0x0b, 0x32, 0x36, 0x15, 0x19, 0xb9, 0xa6, 0x35,
-	0x86, 0xd1, 0x3c, 0x9a, 0x62, 0xff, 0x01, 0x5c, 0x7f, 0x42, 0x3c, 0x72, 0x95, 0x25, 0x64, 0x35,
-	0xb0, 0x7d, 0x22, 0xab, 0x8d, 0x03, 0xce, 0x2b, 0x29, 0xc0, 0xb7, 0x61, 0xfb, 0x05, 0x4d, 0xd8,
-	0x4a, 0x38, 0xeb, 0x7b, 0x80, 0x5c, 0x40, 0x83, 0x6b, 0x53, 0xe4, 0x82, 0x32, 0x95, 0x69, 0xa4,
-	0x85, 0x39, 0x91, 0x48, 0x74, 0xc7, 0xdc, 0x82, 0x5e, 0x1a, 0xd0, 0x8b, 0xd7, 0xa1, 0x33, 0x23,
-	0x2c, 0x11, 0xb5, 0xdd, 0x11, 0x89, 0x3c, 0x25, 0x9e, 0x27, 0x4a, 0xbb, 0x63, 0x7d, 0x01, 0x3b,
-	0x55, 0xfb, 0x8a, 0xe1, 0x77, 0xa1, 0x97, 0xb3, 0x95, 0xa0, 0xb5, 0xc6, 0x62, 0xba, 0x86, 0xd0,
-	0x7f, 0xcd, 0x90, 0x2d, 0xe5, 0xb8, 0x75, 0x0b, 0x86, 0xba, 0x03, 0xc4, 0x81, 0x2c, 0x0e, 0x9b,
-	0xa5, 0x89, 0x0a, 0x67, 0x06, 0x6d, 0x95, 0xce, 0x52, 0x1a, 0xff, 0x97, 0xc2, 0xb5, 0x3c, 0xe8,
-	0x6a, 0x77, 0x96, 0xe7, 0xa8, 0x32, 0x25, 0xe4, 0x58, 0xb8, 0x0d, 0xdd, 0x48, 0xfa, 0x49, 0xa4,
-	0x9d, 0xde, 0xfe, 0x50, 0xb9, 0x90, 0xf9, 0x9f, 0x87, 0x26, 0x26, 0x05, 0xd6, 0x47, 0xfb, 0xa5,
-	0xed, 0x9c, 0xa2, 0xb1, 0xaa, 0x2d, 0x27, 0x42, 0x21, 0xdd, 0xe4, 0x3e, 0xf1, 0xc3, 0xf8, 0x52,
-	0xd8, 0x31, 0xac, 0xef, 0x70, 0x3c, 0x48, 0x06, 0x15, 0xf5, 0x77, 0xb0, 0x50, 0x33, 0x9f, 0x33,
-	0xe6, 0x37, 0x32, 0xe6, 0x75, 0x30, 0x37, 0xa1, 0xed, 0x4b, 0x5b, 0xaa, 0x96, 0x33, 0xe7, 0x94,
-	0x07, 0xd6, 0x13, 0xd8, 0x39, 0x8e, 0xdc, 0xab, 0xe6, 0x63, 0x3e, 0x72, 0xf2, 0x11, 0x24, 0x43,
-	0x6a, 0x64, 0x73, 0x6d, 0x0e, 0x45, 0x15, 0xef, 0x3a, 0x0c, 0x9e, 0x9e, 0x11, 0xac, 0x8e, 0x2c,
-	0xf7, 0x7f, 0xd5, 0xa0, 0x29, 0x76, 0x78, 0xc4, 0xdc, 0x19, 0x65, 0x43, 0xda, 0xab, 0xe7, 0xa3,
-	0x42, 0xe3, 0x0f, 0x2a, 0xcc, 0x1b, 0xc5, 0x99, 0xd8, 0xac, 0xcc, 0xc4, 0xb6, 0x58, 0x63, 0xdc,
-	0x2a, 0x2d, 0x62, 0xf8, 0xcc, 0x27, 0xa5, 0x4c, 0x5f, 0x77, 0x09, 0x7d, 0xe5, 0x69, 0x00, 0xcb,
-	0xa6, 0xc1, 0xef, 0x35, 0xe8, 0x7f, 0x43, 0xd8, 0x79, 0x18, 0xcf, 0x78, 0x92, 0x92, 0x4a, 0xfb,
-	0x61, 0xcd, 0xc6, 0x17, 0x93, 0x93, 0x4b, 0x46, 0x64, 0x76, 0x0d, 0x1e, 0x0f, 0xee, 0x1c, 0xda,
-	0xb2, 0xe9, 0x44, 0x86, 0xcd, 0x4d, 0xe8, 0xbe, 0xba, 0x98, 0xe0, 0x78, 0x0c, 0x63, 0xd9, 0x87,
-	0x42, 0x0c, 0xb7, 0xdc, 0x38, 0x8c, 0x22, 0x22, 0x23, 0x35, 0x38, 0xd8, 0x51, 0x06, 0xd6, 0xca,
-	0xa4, 0x70, 0x27, 0x52, 0x60, 0xed, 0x0c, 0xec, 0x48, 0x83, 0x75, 0x0a, 0x62, 0x19, 0x58, 0x57,
-	0x54, 0x95, 0x0f, 0x9d, 0x83, 0x28, 0x3d, 0x4e, 0xec, 0x29, 0xe1, 0x93, 0x80, 0x85, 0xcc, 0xf6,
-	0x26, 0x29, 0x5f, 0x0a, 0xd7, 0x0d, 0xf3, 0x1a, 0xf4, 0x23, 0x12, 0x63, 0x5d, 0xaa, 0xdd, 0x3a,
-	0x12, 0x65, 0x98, 0x6f, 0xc0, 0x96, 0x58, 0x4e, 0x68, 0x30, 0x99, 0x91, 0x38, 0x20, 0x9e, 0x1f,
-	0xba, 0x44, 0xc5, 0xb1, 0x0b, 0x9b, 0xfa, 0x90, 0x37, 0xa6, 0x38, 0x12, 0xf1, 0x58, 0x47, 0x30,
-	0x3c, 0x3a, 0xc5, 0xcf, 0x33, 0xf3, 0x68, 0x30, 0x7d, 0x62, 0x33, 0x9b, 0x7f, 0x03, 0x10, 0x9f,
-	0x86, 0x6e, 0xa2, 0x0c, 0xa2, 0x36, 0x93, 0x22, 0xc4, 0x9d, 0x64, 0x47, 0x92, 0x34, 0x1c, 0xfe,
-	0xf9, 0x11, 0xa3, 0xbe, 0x32, 0x68, 0xfd, 0x20, 0x82, 0x90, 0xc4, 0x5b, 0xd0, 0xcd, 0x9d, 0xad,
-	0x89, 0x7c, 0xad, 0x67, 0xf9, 0xca, 0x02, 0xdd, 0x83, 0x75, 0xa6, 0xbd, 0x98, 0x60, 0xd5, 0xda,
-	0xaa, 0x37, 0xb6, 0x95, 0x64, 0xd9, 0x47, 0xeb, 0x73, 0x80, 0x97, 0xa2, 0x15, 0x85, 0xc7, 0x38,
-	0x1b, 0x8b, 0x04, 0x21, 0xd1, 0xbe, 0x7d, 0xa1, 0xd9, 0xe1, 0x5b, 0x18, 0xd3, 0x8f, 0x36, 0xf5,
-	0x1c, 0xac, 0x18, 0xe9, 0xe0, 0xdf, 0x35, 0xe8, 0x49, 0x04, 0xe9, 0x24, 0x42, 0x38, 0xd8, 0x7e,
-	0x19, 0xc4, 0xad, 0x0c, 0xb1, 0xfc, 0xb5, 0x29, 0xd8, 0xc4, 0x32, 0x4c, 0xce, 0xed, 0x48, 0x59,
-	0x69, 0x2c, 0x13, 0x7b, 0x0f, 0xfa, 0x32, 0x1b, 0x4a, 0xd0, 0x58, 0x26, 0x78, 0x8f, 0x7f, 0xa8,
-	0xd1, 0x13, 0x31, 0x0b, 0x7b, 0xfb, 0x37, 0x4a, 0x12, 0xc2, 0xc7, 0x3d, 0xf1, 0xfb, 0x34, 0x60,
-	0xf1, 0xe5, 0xf8, 0x1e, 0x40, 0xbe, 0xe2, 0x6d, 0x37, 0x23, 0x97, 0xaa, 0xb2, 0x31, 0x92, 0x33,
-	0xdb, 0x4b, 0x55, 0xe4, 0x8f, 0xea, 0x0f, 0x6b, 0xd6, 0xd7, 0xb0, 0xfe, 0xa5, 0x37, 0xa3, 0x61,
-	0x41, 0x05, 0xa5, 0x7c, 0xfb, 0xa7, 0x30, 0x56, 0xf1, 0xf2, 0x25, 0x0d, 0x70, 0x29, 0xe9, 0xc2,
-	0xbe, 0x0f, 0x23, 0x35, 0x4d, 0x35, 0x9e, 0xac, 0x97, 0x3f, 0x1a, 0x00, 0x39, 0x98, 0xf9, 0x08,
-	0xc6, 0x34, 0x9c, 0x60, 0x49, 0x9d, 0x51, 0x87, 0xc8, 0x16, 0x98, 0xc4, 0xc4, 0x49, 0xe3, 0x84,
-	0x9e, 0x11, 0x35, 0x02, 0x77, 0x54, 0x2c, 0x55, 0x1f, 0x3e, 0x82, 0xed, 0x5c, 0xd7, 0x2d, 0xa8,
-	0xd5, 0x57, 0xaa, 0x3d, 0x80, 0x2d, 0x54, 0xc3, 0xc1, 0x95, 0x96, 0x94, 0x1a, 0x2b, 0x95, 0x3e,
-	0x85, 0xdd, 0x82, 0x9f, 0xbc, 0x52, 0x0b, 0xaa, 0xc6, 0x4a, 0xd5, 0x8f, 0x61, 0x07, 0x55, 0xcf,
-	0x6d, 0xca, 0xaa, 0x7a, 0xcd, 0x7f, 0xe1, 0xa7, 0x4f, 0xe2, 0x69, 0xc9, 0xcf, 0xd6, 0x4a, 0xa5,
-	0x0f, 0x60, 0x13, 0x95, 0x2a, 0x76, 0xda, 0x57, 0xa9, 0x24, 0xc4, 0x61, 0x38, 0x55, 0x0a, 0x2a,
-	0x9d, 0x55, 0x2a, 0xd6, 0x63, 0xe8, 0x3f, 0x4f, 0xa7, 0x84, 0x79, 0x27, 0xba, 0xfa, 0xff, 0x6b,
-	0x03, 0xfd, 0x52, 0x87, 0xde, 0xc1, 0x34, 0x0e, 0xd3, 0xa8, 0xd4, 0xe5, 0xb2, 0x86, 0xe7, 0xba,
-	0x5c, 0xca, 0xdc, 0x85, 0xbe, 0xfc, 0x80, 0x2a, 0x31, 0xd9, 0x5c, 0xe6, 0x7c, 0xa9, 0xf3, 0x4b,
-	0xcc, 0x09, 0xf7, 0x59, 0x09, 0x96, 0xdb, 0xab, 0x50, 0x7e, 0x9f, 0xc1, 0xe0, 0x54, 0x06, 0xa2,
-	0x24, 0x65, 0x2a, 0xef, 0x64, 0x96, 0x73, 0x07, 0xf7, 0x8a, 0x01, 0xcb, 0x26, 0x7a, 0x0e, 0x9b,
-	0x73, 0x9b, 0xe5, 0x5e, 0xb2, 0x8a, 0xbd, 0xd4, 0xdb, 0xdf, 0x52, 0xb0, 0x45, 0x2d, 0xd1, 0x60,
-	0x11, 0x34, 0xa5, 0x3f, 0xef, 0xc3, 0x20, 0x90, 0x1f, 0x1d, 0xcd, 0x44, 0xa3, 0xa0, 0x58, 0xfa,
-	0x20, 0x21, 0x1b, 0x8e, 0xf0, 0x6f, 0x21, 0x1b, 0x45, 0x6e, 0x31, 0x1f, 0xbc, 0x22, 0x50, 0xcc,
-	0x8f, 0x14, 0xfd, 0x63, 0x79, 0x7b, 0x5b, 0xf4, 0x90, 0xd8, 0xff, 0xb3, 0x09, 0x8d, 0xc7, 0x87,
-	0x5f, 0x99, 0xaf, 0x60, 0xbd, 0xf2, 0xb2, 0x31, 0xb3, 0xb1, 0xb2, 0xf8, 0xfd, 0x35, 0x7e, 0x6b,
-	0xd9, 0xb1, 0xba, 0x38, 0xac, 0x71, 0xcc, 0xca, 0xad, 0x42, 0x63, 0x2e, 0xbe, 0xb3, 0x68, 0xcc,
-	0x65, 0x97, 0x91, 0x35, 0xf3, 0x13, 0x68, 0xc9, 0xc7, 0x92, 0x79, 0x4d, 0xc9, 0x96, 0x5e, 0x5d,
-	0xe3, 0xed, 0xca, 0xae, 0x56, 0x3c, 0x00, 0xc8, 0x9f, 0x18, 0xe6, 0x48, 0x89, 0xcd, 0xbd, 0xb2,
-	0xc6, 0xbb, 0x0b, 0x4e, 0x34, 0xc8, 0x31, 0x6c, 0x54, 0x9f, 0x0d, 0x66, 0x85, 0x87, 0xea, 0x25,
-	0x7f, 0x7c, 0x73, 0xe9, 0x79, 0x11, 0xb6, 0xfa, 0x78, 0xd0, 0xb0, 0x4b, 0x9e, 0x22, 0x1a, 0x76,
-	0xe9, 0xab, 0x63, 0xcd, 0xfc, 0x16, 0x86, 0xe5, 0x7b, 0xbf, 0xf9, 0xa6, 0x52, 0x5a, 0xf8, 0x1c,
-	0x19, 0xdf, 0x58, 0x72, 0xaa, 0x01, 0x3f, 0x94, 0xa5, 0x8b, 0x77, 0x8d, 0x8c, 0xe5, 0xc2, 0xa3,
-	0x60, 0x7c, 0xad, 0xbc, 0xa9, 0xb5, 0xee, 0x43, 0x4b, 0xde, 0x20, 0x75, 0xca, 0x4a, 0x17, 0xca,
-	0x71, 0xbf, 0xb8, 0x6b, 0xad, 0xdd, 0xaf, 0xe1, 0x94, 0xea, 0x3c, 0x23, 0x4c, 0xd6, 0x73, 0xd1,
-	0xd4, 0x9c, 0x8a, 0xd8, 0xe4, 0x2a, 0x27, 0x2d, 0xf1, 0xb7, 0xc1, 0x83, 0x7f, 0x02, 0x00, 0x00,
-	0xff, 0xff, 0x8b, 0xba, 0x29, 0x23, 0x43, 0x10, 0x00, 0x00,
+	// 1454 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0xd9, 0x6e, 0x1c, 0x45,
+	0x17, 0xf6, 0xcc, 0xf4, 0x6c, 0x67, 0x16, 0xdb, 0xed, 0xd8, 0x19, 0xcf, 0xff, 0x87, 0x24, 0x4d,
+	0x08, 0x11, 0x8a, 0xac, 0xe0, 0xb0, 0x84, 0x70, 0x01, 0xc1, 0x89, 0x12, 0x50, 0x02, 0x56, 0x62,
+	0x23, 0x71, 0xc3, 0xa8, 0xdd, 0x5d, 0x8c, 0x8b, 0xe9, 0x8d, 0xee, 0x6a, 0x2f, 0xaf, 0x80, 0x78,
+	0x1c, 0xc4, 0x03, 0x20, 0x71, 0xcf, 0x73, 0xf0, 0x14, 0x9c, 0x5a, 0xba, 0x7a, 0x99, 0xc5, 0x70,
+	0xc1, 0xcd, 0x48, 0x55, 0x75, 0xce, 0x77, 0xce, 0xf9, 0xce, 0xd2, 0x55, 0x03, 0x5d, 0x3b, 0xa2,
+	0x7b, 0x51, 0x1c, 0xb2, 0xd0, 0x6c, 0xb2, 0xcb, 0x88, 0x24, 0xd6, 0x2f, 0x35, 0xd8, 0x39, 0x88,
+	0x89, 0xcd, 0xc8, 0x41, 0x18, 0x30, 0x9b, 0x06, 0x24, 0x7e, 0x4d, 0x7e, 0x4a, 0x49, 0xc2, 0x4c,
+	0x80, 0x3a, 0x75, 0x47, 0xb5, 0x5b, 0xb5, 0x7b, 0x5d, 0x13, 0x17, 0x27, 0x69, 0xe0, 0x7a, 0xe4,
+	0xd0, 0x66, 0xa7, 0xa3, 0xba, 0xd8, 0x1b, 0x40, 0x33, 0x61, 0x2e, 0x0d, 0x46, 0x0d, 0xb1, 0x1c,
+	0x42, 0x0b, 0x97, 0x61, 0xca, 0x46, 0x46, 0x61, 0x4d, 0xe2, 0x78, 0xd4, 0x14, 0xeb, 0x75, 0x68,
+	0x3b, 0x61, 0x90, 0x84, 0x1e, 0x19, 0xb5, 0x32, 0x4c, 0xe7, 0x94, 0x38, 0xb3, 0x28, 0xa4, 0x01,
+	0x1b, 0xb5, 0xf9, 0x9e, 0x75, 0x17, 0xae, 0xcf, 0x79, 0x93, 0x44, 0xa8, 0x46, 0xcc, 0x1e, 0x34,
+	0x22, 0xe5, 0xcf, 0xc0, 0x7a, 0x04, 0x83, 0x37, 0x74, 0x1a, 0xd8, 0xde, 0x22, 0x67, 0x95, 0x24,
+	0xf7, 0x72, 0x20, 0xdc, 0x10, 0x92, 0xc2, 0xcd, 0x81, 0xb5, 0x01, 0xc3, 0x4c, 0x53, 0x02, 0x5b,
+	0xbf, 0xd6, 0x60, 0xf3, 0x89, 0xeb, 0x1e, 0xc6, 0xa1, 0x43, 0x92, 0x64, 0x11, 0xe0, 0x06, 0x74,
+	0x18, 0x89, 0x7d, 0xca, 0x51, 0x38, 0x6a, 0xc7, 0xdc, 0x05, 0x23, 0x4d, 0x48, 0x2c, 0x30, 0x7b,
+	0xfb, 0xbd, 0x3d, 0x41, 0xe6, 0xde, 0x31, 0x6e, 0x99, 0x7d, 0x30, 0xec, 0x78, 0x9a, 0x20, 0x0b,
+	0x0d, 0xe9, 0x0b, 0x09, 0xce, 0x90, 0x02, 0xb5, 0x70, 0xce, 0x5d, 0x15, 0xbe, 0xa6, 0xaf, 0x5d,
+	0xa1, 0xaf, 0x53, 0xa1, 0xaf, 0x5b, 0xa5, 0x0f, 0x04, 0x55, 0x8f, 0xc0, 0x10, 0xf6, 0x10, 0x34,
+	0xcd, 0x78, 0xe1, 0x8b, 0xa9, 0x0e, 0x7d, 0x07, 0x86, 0xb6, 0xeb, 0x52, 0x46, 0x43, 0x74, 0xfc,
+	0x39, 0x75, 0x13, 0x74, 0xb7, 0x81, 0x14, 0xdc, 0x06, 0xb3, 0x18, 0xef, 0x22, 0x7e, 0x5f, 0xea,
+	0x3c, 0xe8, 0x0c, 0x2d, 0x22, 0xe6, 0x9d, 0x52, 0x0a, 0xeb, 0x82, 0x8c, 0x4d, 0x45, 0x46, 0xae,
+	0x69, 0x8d, 0x61, 0x34, 0x8f, 0xa6, 0xd8, 0x7f, 0x08, 0xd7, 0x9f, 0x12, 0x8f, 0x5c, 0x65, 0x09,
+	0x59, 0x0d, 0x6c, 0x9f, 0xc8, 0xd2, 0xe3, 0x80, 0xf3, 0x4a, 0x0a, 0xf0, 0x6d, 0xd8, 0x7e, 0x49,
+	0x13, 0xb6, 0x12, 0xce, 0xfa, 0x0e, 0x20, 0x17, 0xd0, 0xe0, 0xda, 0x14, 0xb9, 0xa0, 0x4c, 0x65,
+	0x1a, 0x69, 0x61, 0x4e, 0x24, 0x12, 0xdd, 0x31, 0xb7, 0xa0, 0x97, 0x06, 0xf4, 0xe2, 0x4d, 0xe8,
+	0xcc, 0x08, 0x4b, 0x44, 0xa1, 0x77, 0x44, 0x22, 0x4f, 0x89, 0xe7, 0x89, 0x3a, 0xef, 0x58, 0x9f,
+	0xc3, 0x4e, 0xd5, 0xbe, 0x62, 0xf8, 0x2e, 0xf4, 0x72, 0xb6, 0x12, 0xb4, 0xd6, 0x58, 0x4c, 0xd7,
+	0x10, 0xfa, 0x6f, 0x18, 0xb2, 0xa5, 0x1c, 0xb7, 0x6e, 0xc1, 0x50, 0xb7, 0x83, 0x38, 0x90, 0xc5,
+	0x61, 0xb3, 0x34, 0x51, 0xe1, 0xcc, 0xa0, 0xad, 0xd2, 0x59, 0x4a, 0xe3, 0x7f, 0x52, 0xb8, 0x96,
+	0x07, 0x5d, 0xed, 0xce, 0xf2, 0x1c, 0x55, 0x46, 0x86, 0x9c, 0x11, 0xb7, 0xa1, 0x1b, 0x49, 0x3f,
+	0x89, 0xb4, 0xd3, 0xdb, 0x1f, 0x2a, 0x17, 0x32, 0xff, 0xf3, 0xd0, 0xc4, 0xd8, 0xc0, 0xfa, 0x68,
+	0xbf, 0xb2, 0x9d, 0x53, 0x34, 0x56, 0xb5, 0xe5, 0x44, 0x28, 0xa4, 0x9b, 0xdc, 0x27, 0x7e, 0x18,
+	0x5f, 0x0a, 0x3b, 0x86, 0xf5, 0x2d, 0x8e, 0x07, 0xc9, 0xa0, 0xa2, 0xfe, 0x0e, 0x16, 0x6a, 0xe6,
+	0x73, 0xc6, 0xfc, 0x46, 0xc6, 0xbc, 0x0e, 0xe6, 0x26, 0xb4, 0x7d, 0x69, 0x4b, 0xd5, 0x72, 0xe6,
+	0x9c, 0xf2, 0xc0, 0x7a, 0x0a, 0x3b, 0xc7, 0x91, 0x7b, 0xd5, 0xb0, 0xcc, 0x47, 0x4e, 0x3e, 0x82,
+	0x64, 0x48, 0x82, 0x05, 0x6b, 0x17, 0xae, 0xcf, 0xa1, 0xa8, 0xe2, 0x5d, 0x87, 0xc1, 0xb3, 0x33,
+	0x82, 0xd5, 0x91, 0xe5, 0xfe, 0xcf, 0x1a, 0x34, 0xc5, 0x0e, 0x8f, 0x98, 0x3b, 0xa3, 0x6c, 0x48,
+	0x7b, 0xf5, 0x7c, 0x54, 0x68, 0xfc, 0x41, 0x85, 0x79, 0xa3, 0x38, 0x13, 0x9b, 0x95, 0x99, 0xd8,
+	0x16, 0x6b, 0x8c, 0x5b, 0xa5, 0x45, 0x0c, 0x9f, 0xf9, 0xa4, 0x94, 0xe9, 0xeb, 0x2e, 0xa1, 0xaf,
+	0x3c, 0x0d, 0x60, 0xd9, 0x34, 0xf8, 0xad, 0x06, 0xfd, 0xaf, 0x09, 0x3b, 0x0f, 0xe3, 0x19, 0x4f,
+	0x52, 0x52, 0x69, 0x3f, 0xac, 0xd9, 0xf8, 0x62, 0x72, 0x72, 0xc9, 0x88, 0xcc, 0xae, 0xc1, 0xe3,
+	0xc1, 0x9d, 0x43, 0x5b, 0x36, 0x9d, 0xc8, 0xb0, 0xb9, 0x09, 0xdd, 0xd7, 0x17, 0x13, 0x1c, 0x8f,
+	0x61, 0x2c, 0xfb, 0x50, 0x88, 0xe1, 0x96, 0x1b, 0x87, 0x51, 0x44, 0x64, 0xa4, 0x06, 0x07, 0x3b,
+	0xca, 0xc0, 0x5a, 0x99, 0x14, 0xee, 0x44, 0x0a, 0xac, 0x9d, 0x81, 0x1d, 0x69, 0xb0, 0x4e, 0x41,
+	0x2c, 0x03, 0xeb, 0x8a, 0xaa, 0xf2, 0xa1, 0x73, 0x10, 0xa5, 0xc7, 0x89, 0x3d, 0x25, 0x7c, 0x12,
+	0xb0, 0x90, 0xd9, 0xde, 0x24, 0xe5, 0x4b, 0xe1, 0xba, 0x61, 0x5e, 0x83, 0x7e, 0x44, 0x62, 0xac,
+	0x4b, 0xb5, 0x5b, 0x47, 0xa2, 0x0c, 0xf3, 0x7f, 0xb0, 0x25, 0x96, 0x13, 0x1a, 0x4c, 0x66, 0x24,
+	0x0e, 0x88, 0xe7, 0x87, 0x2e, 0x51, 0x71, 0xec, 0xc2, 0xa6, 0x3e, 0xe4, 0x8d, 0x29, 0x8e, 0x44,
+	0x3c, 0xd6, 0x11, 0x0c, 0x8f, 0x4e, 0xf1, 0x5b, 0xcd, 0x3c, 0x1a, 0x4c, 0x9f, 0xda, 0xcc, 0xe6,
+	0xdf, 0x00, 0xc4, 0xa7, 0xa1, 0x9b, 0x28, 0x83, 0xa8, 0xcd, 0xa4, 0x08, 0x71, 0x27, 0xd9, 0x91,
+	0x24, 0x0d, 0x87, 0x7f, 0x7e, 0xc4, 0xa8, 0xaf, 0x0c, 0x5a, 0xdf, 0x8b, 0x20, 0x24, 0xf1, 0x16,
+	0x74, 0x73, 0x67, 0x6b, 0x22, 0x5f, 0xeb, 0x59, 0xbe, 0xb2, 0x40, 0xf7, 0x60, 0x9d, 0x69, 0x2f,
+	0x26, 0x58, 0xb5, 0xb6, 0xea, 0x8d, 0x6d, 0x25, 0x59, 0xf6, 0xd1, 0xfa, 0x0c, 0xe0, 0x95, 0x68,
+	0x45, 0xe1, 0x31, 0xce, 0xc6, 0x22, 0x41, 0x48, 0xb4, 0x6f, 0x5f, 0x68, 0x76, 0xf8, 0x16, 0xc6,
+	0xf4, 0x83, 0x4d, 0x3d, 0x07, 0x2b, 0x46, 0x3a, 0xf8, 0x57, 0x0d, 0x7a, 0x12, 0x41, 0x3a, 0x89,
+	0x10, 0x0e, 0xb6, 0x5f, 0x06, 0x71, 0x2b, 0x43, 0x2c, 0x7f, 0x6d, 0x0a, 0x36, 0xb1, 0x0c, 0x93,
+	0x73, 0x3b, 0x52, 0x56, 0x1a, 0xcb, 0xc4, 0xde, 0x85, 0xbe, 0xcc, 0x86, 0x12, 0x34, 0x96, 0x09,
+	0xde, 0xe7, 0x1f, 0x6a, 0xf4, 0x44, 0xcc, 0xc2, 0xde, 0xfe, 0x8d, 0x92, 0x84, 0xf0, 0x71, 0x4f,
+	0xfc, 0x3e, 0x0b, 0x58, 0x7c, 0x39, 0xbe, 0x0f, 0x90, 0xaf, 0x78, 0xdb, 0xcd, 0xc8, 0xa5, 0xaa,
+	0x6c, 0x8c, 0xe4, 0xcc, 0xf6, 0x52, 0x15, 0xf9, 0xe3, 0xfa, 0xa3, 0x9a, 0xf5, 0x15, 0xac, 0x7f,
+	0xe1, 0xcd, 0x68, 0x58, 0x50, 0x41, 0x29, 0xdf, 0xfe, 0x31, 0x8c, 0x55, 0xbc, 0x7c, 0x49, 0x03,
+	0x5c, 0x4a, 0xba, 0xb0, 0xef, 0xc3, 0x48, 0x4d, 0x53, 0x8d, 0x27, 0xeb, 0xe5, 0xf7, 0x06, 0x40,
+	0x0e, 0x66, 0x3e, 0x86, 0x31, 0x0d, 0x27, 0x58, 0x52, 0x67, 0xd4, 0x21, 0xb2, 0x05, 0x26, 0x31,
+	0x71, 0xd2, 0x38, 0xa1, 0x67, 0x44, 0x8d, 0xc0, 0x1d, 0x15, 0x4b, 0xd5, 0x87, 0x0f, 0x61, 0x3b,
+	0xd7, 0x75, 0x0b, 0x6a, 0xf5, 0x95, 0x6a, 0x0f, 0x61, 0x0b, 0xd5, 0x70, 0x70, 0xa5, 0x25, 0xa5,
+	0xc6, 0x4a, 0xa5, 0x4f, 0x60, 0xb7, 0xe0, 0x27, 0xaf, 0xd4, 0x82, 0xaa, 0xb1, 0x52, 0xf5, 0x23,
+	0xd8, 0x41, 0xd5, 0x73, 0x9b, 0xb2, 0xaa, 0x5e, 0xf3, 0x1f, 0xf8, 0xe9, 0x93, 0x78, 0x5a, 0xf2,
+	0xb3, 0xb5, 0x52, 0xe9, 0x7d, 0xd8, 0x44, 0xa5, 0x8a, 0x9d, 0xf6, 0x55, 0x2a, 0x09, 0x71, 0x18,
+	0x4e, 0x95, 0x82, 0x4a, 0x67, 0x95, 0x8a, 0xf5, 0x04, 0xfa, 0x2f, 0xd2, 0x29, 0x61, 0xde, 0x89,
+	0xae, 0xfe, 0x7f, 0xdb, 0x40, 0x3f, 0xd7, 0xa1, 0x77, 0x30, 0x8d, 0xc3, 0x34, 0x2a, 0x75, 0xb9,
+	0xac, 0xe1, 0xb9, 0x2e, 0x97, 0x32, 0xf7, 0xa0, 0x2f, 0x3f, 0xa0, 0x4a, 0x4c, 0x36, 0x97, 0x39,
+	0x5f, 0xea, 0xfc, 0x12, 0x73, 0xc2, 0x7d, 0x56, 0x82, 0xe5, 0xf6, 0x2a, 0x94, 0xdf, 0xa7, 0x30,
+	0x38, 0x95, 0x81, 0x28, 0x49, 0x99, 0xca, 0x3b, 0x99, 0xe5, 0xdc, 0xc1, 0xbd, 0x62, 0xc0, 0xb2,
+	0x89, 0x5e, 0xc0, 0xe6, 0xdc, 0x66, 0xb9, 0x97, 0xac, 0x62, 0x2f, 0xf5, 0xf6, 0xb7, 0x14, 0x6c,
+	0x51, 0x4b, 0x34, 0x58, 0x04, 0x4d, 0xe9, 0xcf, 0x7b, 0x30, 0x08, 0xe4, 0x47, 0x47, 0x33, 0xd1,
+	0x28, 0x28, 0x96, 0x3e, 0x48, 0xc8, 0x86, 0x23, 0xfc, 0x5b, 0xc8, 0x46, 0x91, 0x5b, 0xcc, 0x07,
+	0xaf, 0x08, 0x14, 0xf3, 0x23, 0x45, 0xff, 0x58, 0xde, 0xde, 0x16, 0x3d, 0x24, 0xf6, 0xff, 0x68,
+	0x42, 0xe3, 0xc9, 0xe1, 0x97, 0xe6, 0x6b, 0x58, 0xaf, 0x3c, 0x73, 0xcc, 0x6c, 0xac, 0x2c, 0x7e,
+	0x8c, 0x8d, 0xdf, 0x5a, 0x76, 0xac, 0x2e, 0x0e, 0x6b, 0x1c, 0xb3, 0x72, 0xab, 0xd0, 0x98, 0x8b,
+	0xef, 0x2c, 0x1a, 0x73, 0xd9, 0x65, 0x64, 0xcd, 0xfc, 0x18, 0x5a, 0xf2, 0xb1, 0x64, 0x5e, 0x53,
+	0xb2, 0xa5, 0x57, 0xd7, 0x78, 0xbb, 0xb2, 0xab, 0x15, 0x0f, 0x00, 0xf2, 0x27, 0x86, 0x39, 0x52,
+	0x62, 0x73, 0xaf, 0xac, 0xf1, 0xee, 0x82, 0x13, 0x0d, 0x72, 0x0c, 0x1b, 0xd5, 0x67, 0x83, 0x59,
+	0xe1, 0xa1, 0x7a, 0xc9, 0x1f, 0xdf, 0x5c, 0x7a, 0x5e, 0x84, 0xad, 0x3e, 0x1e, 0x34, 0xec, 0x92,
+	0xa7, 0x88, 0x86, 0x5d, 0xfa, 0xea, 0x58, 0x33, 0xbf, 0x81, 0x61, 0xf9, 0xde, 0x6f, 0xfe, 0x5f,
+	0x29, 0x2d, 0x7c, 0x8e, 0x8c, 0x6f, 0x2c, 0x39, 0xd5, 0x80, 0x1f, 0xc8, 0xd2, 0xc5, 0xbb, 0x46,
+	0xc6, 0x72, 0xe1, 0x51, 0x30, 0xbe, 0x56, 0xde, 0xd4, 0x5a, 0x0f, 0xa0, 0x25, 0x6f, 0x90, 0x3a,
+	0x65, 0xa5, 0x0b, 0xe5, 0xb8, 0x5f, 0xdc, 0xb5, 0xd6, 0x1e, 0xd4, 0x70, 0x4a, 0x75, 0x9e, 0x13,
+	0x26, 0xeb, 0xb9, 0x68, 0x6a, 0x4e, 0x45, 0x6c, 0x72, 0x95, 0x93, 0x96, 0xf8, 0x0f, 0xe1, 0xe1,
+	0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa6, 0xf1, 0xd0, 0x3c, 0x50, 0x10, 0x00, 0x00,
 }
diff --git a/api/grpc/types/api.proto b/api/grpc/types/api.proto
index c2937a3..4f145b5 100644
--- a/api/grpc/types/api.proto
+++ b/api/grpc/types/api.proto
@@ -26,6 +26,7 @@ message CreateContainerRequest {
 }
 
 message CreateContainerResponse {
+    uint32 pid = 1; // PID of the containers main process
 }
 
 message SignalRequest {
diff --git a/containerd/main.go b/containerd/main.go
index 7aea853..edc20ec 100644
--- a/containerd/main.go
+++ b/containerd/main.go
@@ -62,6 +62,10 @@ var daemonFlags = []cli.Flag{
 		Value: "/run/containerd/containerd.sock",
 		Usage: "Address on which GRPC API will listen",
 	},
+	cli.BoolFlag{
+		Name:  "oom-notify",
+		Usage: "enable oom notifications for containers",
+	},
 }
 
 func main() {
@@ -89,6 +93,7 @@ func main() {
 			context.String("listen"),
 			context.String("state-dir"),
 			context.Int("concurrency"),
+			context.Bool("oom-notify"),
 		); err != nil {
 			logrus.Fatal(err)
 		}
@@ -146,9 +151,9 @@ func processMetrics() {
 	}()
 }
 
-func daemon(id, address, stateDir string, concurrency int) error {
+func daemon(id, address, stateDir string, concurrency int, oom bool) error {
 	tasks := make(chan *containerd.StartTask, concurrency*100)
-	supervisor, err := containerd.NewSupervisor(id, stateDir, tasks)
+	supervisor, err := containerd.NewSupervisor(id, stateDir, tasks, oom)
 	if err != nil {
 		return err
 	}
diff --git a/create.go b/create.go
index 8bf6775..657a684 100644
--- a/create.go
+++ b/create.go
@@ -15,12 +15,13 @@ func (h *StartEvent) Handle(e *Event) error {
 	}
 	ContainersCounter.Inc(1)
 	task := &StartTask{
-		Err:       e.Err,
-		IO:        io,
-		Container: container,
-		Stdin:     e.Stdin,
-		Stdout:    e.Stdout,
-		Stderr:    e.Stderr,
+		Err:           e.Err,
+		IO:            io,
+		Container:     container,
+		Stdin:         e.Stdin,
+		Stdout:        e.Stdout,
+		Stderr:        e.Stderr,
+		StartResponse: e.StartResponse,
 	}
 	if e.Checkpoint != nil {
 		task.Checkpoint = e.Checkpoint.Name
diff --git a/ctr/container.go b/ctr/container.go
index e2c4768..a1de897 100644
--- a/ctr/container.go
+++ b/ctr/container.go
@@ -121,7 +121,8 @@ var StartCommand = cli.Command{
 				}
 			}
 		}
-		if _, err := c.CreateContainer(netcontext.Background(), r); err != nil {
+		resp, err := c.CreateContainer(netcontext.Background(), r)
+		if err != nil {
 			fatal(err.Error(), 1)
 		}
 		if context.Bool("attach") {
@@ -140,6 +141,8 @@ var StartCommand = cli.Command{
 					os.Exit(int(e.Status))
 				}
 			}
+		} else {
+			fmt.Println(resp.Pid)
 		}
 	},
 }
diff --git a/event.go b/event.go
index f316ff3..4ab5041 100644
--- a/event.go
+++ b/event.go
@@ -23,6 +23,7 @@ const (
 	DeleteCheckpointEventType EventType = "deleteCheckpoint"
 	StatsEventType            EventType = "events"
 	UnsubscribeStatsEventType EventType = "unsubscribeEvents"
+	OOMEventType              EventType = "oom"
 )
 
 func NewEvent(t EventType) *Event {
@@ -33,24 +34,29 @@ func NewEvent(t EventType) *Event {
 	}
 }
 
+type StartResponse struct {
+	Pid int
+}
+
 type Event struct {
-	Type       EventType
-	Timestamp  time.Time
-	ID         string
-	BundlePath string
-	Stdout     string
-	Stderr     string
-	Stdin      string
-	Console    string
-	Pid        int
-	Status     int
-	Signal     os.Signal
-	Process    *specs.Process
-	State      *runtime.State
-	Containers []runtime.Container
-	Checkpoint *runtime.Checkpoint
-	Err        chan error
-	Stats      chan interface{}
+	Type          EventType
+	Timestamp     time.Time
+	ID            string
+	BundlePath    string
+	Stdout        string
+	Stderr        string
+	Stdin         string
+	Console       string
+	Pid           int
+	Status        int
+	Signal        os.Signal
+	Process       *specs.Process
+	State         *runtime.State
+	Containers    []runtime.Container
+	Checkpoint    *runtime.Checkpoint
+	Err           chan error
+	StartResponse chan StartResponse
+	Stats         chan interface{}
 }
 
 type Handler interface {
diff --git a/linux/linux.go b/linux/linux.go
index da048ad..c2aff8f 100644
--- a/linux/linux.go
+++ b/linux/linux.go
@@ -363,6 +363,10 @@ func (c *libcontainerContainer) RemoveProcess(pid int) error {
 	return err
 }
 
+func (c *libcontainerContainer) OOM() (<-chan struct{}, error) {
+	return c.c.NotifyOOM()
+}
+
 func NewRuntime(stateDir string) (runtime.Runtime, error) {
 	f, err := libcontainer.New(stateDir, libcontainer.Cgroupfs, func(l *libcontainer.LinuxFactory) error {
 		//l.CriuPath = context.GlobalString("criu")
diff --git a/oom.go b/oom.go
new file mode 100644
index 0000000..9044979
--- /dev/null
+++ b/oom.go
@@ -0,0 +1,80 @@
+package containerd
+
+import (
+	"reflect"
+	"sync"
+)
+
+func newNotifier(s *Supervisor) *notifier {
+	n := &notifier{
+		s:          s,
+		channels:   make(map[<-chan struct{}]string),
+		controller: make(chan struct{}),
+	}
+	go n.start()
+	return n
+}
+
+type notifier struct {
+	m          sync.Mutex
+	channels   map[<-chan struct{}]string
+	controller chan struct{}
+	s          *Supervisor
+}
+
+func (n *notifier) start() {
+	for {
+		c := n.createCase()
+		i, _, ok := reflect.Select(c)
+		if i == 0 {
+			continue
+		}
+		if ok {
+			ch := c[i].Chan.Interface().(<-chan struct{})
+			id := n.channels[ch]
+			e := NewEvent(OOMEventType)
+			e.ID = id
+			n.s.SendEvent(e)
+			continue
+		}
+		// the channel was closed and we should remove it
+		ch := c[i].Chan.Interface().(<-chan struct{})
+		n.removeChan(ch)
+	}
+}
+
+func (n *notifier) Add(ch <-chan struct{}, id string) {
+	n.m.Lock()
+	n.channels[ch] = id
+	n.m.Unlock()
+	// signal the main loop to break and add the new
+	// channels
+	n.controller <- struct{}{}
+}
+
+func (n *notifier) createCase() []reflect.SelectCase {
+	var out []reflect.SelectCase
+	// add controller chan so that we can signal when we need to make
+	// changes in the select.  The controller chan will always be at
+	// index 0 in the slice
+	out = append(out, reflect.SelectCase{
+		Dir:  reflect.SelectRecv,
+		Chan: reflect.ValueOf(n.controller),
+	})
+	n.m.Lock()
+	for ch := range n.channels {
+		v := reflect.ValueOf(ch)
+		out = append(out, reflect.SelectCase{
+			Dir:  reflect.SelectRecv,
+			Chan: v,
+		})
+	}
+	n.m.Unlock()
+	return out
+}
+
+func (n *notifier) removeChan(ch <-chan struct{}) {
+	n.m.Lock()
+	delete(n.channels, ch)
+	n.m.Unlock()
+}
diff --git a/runc/runc.go b/runc/runc.go
index fe357ae..75f48b1 100644
--- a/runc/runc.go
+++ b/runc/runc.go
@@ -111,6 +111,10 @@ func (c *runcContainer) Checkpoints() ([]runtime.Checkpoint, error) {
 	return nil, errors.New("not implemented")
 }
 
+func (c *runcContainer) OOM() (<-chan struct{}, error) {
+	return nil, errors.New("not implemented")
+}
+
 func (c *runcContainer) newCommand(args ...string) *exec.Cmd {
 	cmd := exec.Command("runc", append([]string{"--root", c.stateDir, "--id", c.id}, args...)...)
 	cmd.Dir = c.path
diff --git a/runtime/container.go b/runtime/container.go
index d2e5e5e..40ad188 100644
--- a/runtime/container.go
+++ b/runtime/container.go
@@ -111,4 +111,6 @@ type Container interface {
 	Restore(name string) error
 	// Stats returns realtime container stats and resource information
 	Stats() (*Stat, error)
+	// OOM signals the channel if the container received an OOM notification
+	OOM() (<-chan struct{}, error)
 }
diff --git a/supervisor.go b/supervisor.go
index 09c07c1..21ce252 100644
--- a/supervisor.go
+++ b/supervisor.go
@@ -17,7 +17,7 @@ import (
 const statsInterval = 1 * time.Second
 
 // NewSupervisor returns an initialized Process supervisor.
-func NewSupervisor(id, stateDir string, tasks chan *StartTask) (*Supervisor, error) {
+func NewSupervisor(id, stateDir string, tasks chan *StartTask, oom bool) (*Supervisor, error) {
 	if err := os.MkdirAll(stateDir, 0755); err != nil {
 		return nil, err
 	}
@@ -41,6 +41,9 @@ func NewSupervisor(id, stateDir string, tasks chan *StartTask) (*Supervisor, err
 		subscribers:    make(map[chan *Event]struct{}),
 		statsCollector: newStatsCollector(statsInterval),
 	}
+	if oom {
+		s.notifier = newNotifier(s)
+	}
 	// register default event handlers
 	s.handlers = map[EventType]Handler{
 		ExecExitEventType:         &ExecExitEvent{s},
@@ -81,6 +84,7 @@ type Supervisor struct {
 	machine        Machine
 	containerGroup sync.WaitGroup
 	statsCollector *statsCollector
+	notifier       *notifier
 }
 
 // Stop closes all tasks and sends a SIGTERM to each container's pid1 then waits for they to
diff --git a/worker.go b/worker.go
index eb15c69..040be27 100644
--- a/worker.go
+++ b/worker.go
@@ -4,6 +4,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/Sirupsen/logrus"
 	"github.com/docker/containerd/runtime"
 )
 
@@ -12,13 +13,14 @@ type Worker interface {
 }
 
 type StartTask struct {
-	Container  runtime.Container
-	Checkpoint string
-	IO         *runtime.IO
-	Stdin      string
-	Stdout     string
-	Stderr     string
-	Err        chan error
+	Container     runtime.Container
+	Checkpoint    string
+	IO            *runtime.IO
+	Stdin         string
+	Stdout        string
+	Stderr        string
+	Err           chan error
+	StartResponse chan StartResponse
 }
 
 func NewWorker(s *Supervisor, wg *sync.WaitGroup) Worker {
@@ -63,7 +65,22 @@ func (w *worker) Start() {
 				continue
 			}
 		}
+		pid, err := t.Container.Pid()
+		if err != nil {
+			logrus.WithField("error", err).Error("containerd: get container main pid")
+		}
+		if w.s.notifier != nil {
+			n, err := t.Container.OOM()
+			if err != nil {
+				logrus.WithField("error", err).Error("containerd: notify OOM events")
+			} else {
+				w.s.notifier.Add(n, t.Container.ID())
+			}
+		}
 		ContainerStartTimer.UpdateSince(started)
 		t.Err <- nil
+		t.StartResponse <- StartResponse{
+			Pid: pid,
+		}
 	}
 }