GitList

Browse code

Moved resetLock() to the Load() method ; changed resetLock() to initLock() and changed behavior to not modify the lock if it was already set (not nil)

shin- authored on 2013/04/03 21:39:39
Showing 3 changed files

container.go index b89885a..8f993a3 100644
runtime.go index 9f571cf..e096202 100644
state.go index c7e89f2..bf325a3 100644

@@ -127,7 +127,6 @@ func (container *Container) FromDisk() error {
 	if err := json.Unmarshal(data, container); err != nil {
 		return err
 	}
-	container.State.resetLock()
 	return nil
 }
 

runtime.go

History View file @ d1767bb

@@ -117,6 +117,7 @@ func (runtime *Runtime) Load(id string) (*Container, error) {
 	if err := container.FromDisk(); err != nil {
 		return nil, err
 	}
+	container.State.initLock()
 	if container.Id != id {
 		return container, fmt.Errorf("Container %s is stored at %s", container.Id, id)
 	}

state.go

History View file @ d1767bb

@@ -39,9 +39,11 @@ func (s *State) setStopped(exitCode int) {
                      	s.broadcast()
+                     }
                     -func (s *State) resetLock() {
                     -	s.stateChangeLock = &sync.Mutex{}
                     -	s.stateChangeCond = sync.NewCond(s.stateChangeLock)
                     +func (s *State) initLock() {
                     +	if s.stateChangeLock == nil {
                     +		s.stateChangeLock = &sync.Mutex{}
                     +		s.stateChangeCond = sync.NewCond(s.stateChangeLock)
                     +	}
+                     }
                      func (s *State) broadcast() {

...	...	@@ -127,7 +127,6 @@ func (container *Container) FromDisk() error {
127	127	if err := json.Unmarshal(data, container); err != nil {
128	128	return err
129	129	}
130		- container.State.resetLock()
131	130	return nil
132	131	}
133	132

...	...	@@ -117,6 +117,7 @@ func (runtime Runtime) Load(id string) (Container, error) {
117	117	if err := container.FromDisk(); err != nil {
118	118	return nil, err
119	119	}
	120	+ container.State.initLock()
120	121	if container.Id != id {
121	122	return container, fmt.Errorf("Container %s is stored at %s", container.Id, id)
122	123	}