X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=run.go;h=1c1b0d7759295786f9e1237975a5a8e18064bd1f;hb=c41fe0fbd726f397636b569161f286821e221885;hp=a4aeb8738206b7bac7030d28dce67e07ffb74714;hpb=468a150138cdc10c3ec5ee00a77db06429b47456;p=goredo.git

diff --git a/run.go b/run.go
index a4aeb87..1c1b0d7 100644
--- a/run.go
+++ b/run.go
@@ -89,7 +89,7 @@ func (e *RunErr) Name() string {
 	if e.Finished == nil {
 		return name
 	}
-	return fmt.Sprintf("%s (%fsec)", name, e.Finished.Sub(*e.Started).Seconds())
+	return fmt.Sprintf("%s (%.3fs)", name, e.Finished.Sub(*e.Started).Seconds())
 }
 
 func (e RunErr) Error() string {
@@ -362,18 +362,6 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		fdNum++
 	}
 
-	if JSR == nil {
-		// infinite jobs
-		cmd.Env = append(cmd.Env, fmt.Sprintf("%s=NO", EnvJSFd))
-	} else {
-		cmd.ExtraFiles = append(cmd.ExtraFiles, JSR)
-		cmd.ExtraFiles = append(cmd.ExtraFiles, JSW)
-		cmd.Env = append(cmd.Env, fmt.Sprintf(
-			"%s=%d,%d", EnvJSFd, 3+fdNum+0, 3+fdNum+1,
-		))
-		fdNum += 2
-	}
-
 	// Preparing stderr
 	var fdStderr *os.File
 	if StderrKeep {
@@ -396,7 +384,21 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 
 	Jobs.Add(1)
 	go func() {
-		jsAcquire(shCtx)
+		jsToken := jsAcquire(shCtx)
+		if JSR == nil {
+			// infinite jobs
+			cmd.Env = append(cmd.Env, fmt.Sprintf("%s=NO", EnvJobs))
+		} else {
+			cmd.ExtraFiles = append(cmd.ExtraFiles, JSR)
+			cmd.ExtraFiles = append(cmd.ExtraFiles, JSW)
+			cmd.Env = append(cmd.Env, fmt.Sprintf(
+				"%s=%s %s%d,%d",
+				MakeFlagsName, MakeFlags, MakeJSArg, 3+fdNum+0, 3+fdNum+1,
+			))
+			fdNum += 2
+			cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvJSToken, jsToken))
+		}
+
 		if FdStatus != nil {
 			FdStatus.Write([]byte{StatusRun})
 		}
@@ -421,7 +423,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		fdNum++
 
 		defer func() {
-			jsRelease(shCtx)
+			jsRelease(shCtx, jsToken)
 			lockRelease()
 			fdDep.Close()
 			fdStdout.Close()
@@ -468,7 +470,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 				if fdStderr != nil {
 					ts.FromTime(time.Now())
 					LogMutex.Lock()
-					fmt.Fprintf(fdStderr, "%s %s\n", tai64n.Encode(ts[:]), line)
+					fmt.Fprintln(fdStderr, tai64n.Encode(ts[:]), line)
 					LogMutex.Unlock()
 				}
 				if StderrSilent {