Formatting.

Author: AlliBalliBaba

phpmainthread_test.go

@@ -103,7 +103,7 @@ func TestTransitionThreadsWhileDoingRequests(t *testing.T) {
 				case 2:
 					convertToWorkerThread(phpThreads[i], workers[worker2Path])
 				case 3:
-                	convertToInactiveThread(phpThreads[i])
+					convertToInactiveThread(phpThreads[i])
 				}
 				time.Sleep(time.Millisecond)
 				if !isRunning.Load() {

phpthread.go

@@ -40,10 +40,6 @@ func newPHPThread(threadIndex int) *phpThread {
 	}
 }
 
-func (thread *phpThread) getActiveRequest() *http.Request {
-	return thread.handler.getActiveRequest()
-}
-
 // change the thread handler safely
 func (thread *phpThread) setHandler(handler threadHandler) {
 	thread.mu.Lock()
@@ -59,6 +55,10 @@ func (thread *phpThread) setHandler(handler threadHandler) {
 	thread.state.set(stateTransitionComplete)
 }
 
+func (thread *phpThread) getActiveRequest() *http.Request {
+	return thread.handler.getActiveRequest()
+}
+
 // Pin a string that is not null-terminated
 // PHP's zend_string may contain null-bytes
 func (thread *phpThread) pinString(s string) *C.char {

state.go

@@ -61,6 +61,11 @@ func (ts *threadState) compareAndSwap(compareTo stateID, swapTo stateID) bool {
 	return false
 }
 
+func (ts *threadState) name() string {
+	// TODO: return the actual name for logging/metrics
+	return "state:" + strconv.Itoa(int(ts.get()))
+}
+
 func (ts *threadState) get() stateID {
 	ts.mu.RLock()
 	defer ts.mu.RUnlock()
@@ -88,11 +93,6 @@ func (h *threadState) set(nextState stateID) {
 	h.subscribers = newSubscribers
 }
 
-func (ts *threadState) name() string {
-	// TODO: return the actual name for logging/metrics
-	return "state:" + strconv.Itoa(int(ts.get()))
-}
-
 // block until the thread reaches a certain state
 func (h *threadState) waitFor(states ...stateID) {
 	h.mu.Lock()

thread-inactive.go

@@ -18,10 +18,6 @@ func convertToInactiveThread(thread *phpThread) {
 	thread.setHandler(&inactiveThread{thread: thread})
 }
 
-func (thread *inactiveThread) getActiveRequest() *http.Request {
-	panic("inactive threads have no requests")
-}
-
 func (handler *inactiveThread) beforeScriptExecution() string {
 	thread := handler.thread
 
@@ -47,3 +43,7 @@ func (handler *inactiveThread) beforeScriptExecution() string {
 func (thread *inactiveThread) afterScriptExecution(exitStatus int) {
 	panic("inactive threads should not execute scripts")
 }
+
+func (thread *inactiveThread) getActiveRequest() *http.Request {
+	panic("inactive threads have no requests")
+}

thread-worker.go

@@ -41,14 +41,6 @@ func convertToWorkerThread(thread *phpThread, worker *worker) {
 	}
 }
 
-func (handler *workerThread) getActiveRequest() *http.Request {
-	if handler.workerRequest != nil {
-		return handler.workerRequest
-	}
-
-	return handler.fakeRequest
-}
-
 // return the name of the script or an empty string if no script should be executed
 func (handler *workerThread) beforeScriptExecution() string {
 	switch handler.state.get() {
@@ -68,7 +60,7 @@ func (handler *workerThread) beforeScriptExecution() string {
 		handler.state.waitFor(stateReady, stateShuttingDown)
 		return handler.beforeScriptExecution()
 	case stateReady, stateTransitionComplete:
-		setUpWorkerScript(handler, handler.worker)
+		setupWorkerScript(handler, handler.worker)
 		return handler.worker.fileName
 	}
 	panic("unexpected state: " + handler.state.name())
@@ -78,7 +70,15 @@ func (handler *workerThread) afterScriptExecution(exitStatus int) {
 	tearDownWorkerScript(handler, exitStatus)
 }
 
-func setUpWorkerScript(handler *workerThread, worker *worker) {
+func (handler *workerThread) getActiveRequest() *http.Request {
+	if handler.workerRequest != nil {
+		return handler.workerRequest
+	}
+
+	return handler.fakeRequest
+}
+
+func setupWorkerScript(handler *workerThread, worker *worker) {
 	handler.backoff.wait()
 	metrics.StartWorker(worker.fileName)