renamed cml-fork-collecting to cml-fork/collecting
This commit is contained in:
		
							parent
							
								
									05600a0c92
								
							
						
					
					
						commit
						b3f20e6ed0
					
				| 
						 | 
				
			
			@ -23,7 +23,7 @@
 | 
			
		|||
 | 
			
		||||
    (cml-sync-ch/receive-rv res-ch)))
 | 
			
		||||
 | 
			
		||||
(define (cml-fork-collecting fds sig-ch thunk)
 | 
			
		||||
(define (cml-fork/collecting fds sig-ch thunk)
 | 
			
		||||
  (let* ((ch (cml-sync-ch/make-channel))
 | 
			
		||||
	 (res-ch (cml-sync-ch/make-channel))
 | 
			
		||||
	 (sig-rv (cml-sync-ch/receive-rv sig-ch))
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										8
									
								
								jobd.scm
								
								
								
								
							
							
						
						
									
										8
									
								
								jobd.scm
								
								
								
								
							| 
						 | 
				
			
			@ -12,21 +12,21 @@
 | 
			
		|||
  jobber-sig-index
 | 
			
		||||
  (shutdown stop continue))
 | 
			
		||||
 | 
			
		||||
(define (cml-fork-collecting->rv id job-desc sig-ch)
 | 
			
		||||
(define (cml-fork/collecting->rv id job-desc sig-ch)
 | 
			
		||||
  (let* ((ch (cml-sync-ch/make-channel))
 | 
			
		||||
	 (cwd (job-desc-wd job-desc))
 | 
			
		||||
	 (env (job-desc-env job-desc))
 | 
			
		||||
	 (cmd (job-desc-cmd job-desc))
 | 
			
		||||
	 (fds (list 1 2))
 | 
			
		||||
	 (thunk (lambda () (with-total-env ,env (with-cwd cwd cmd))))
 | 
			
		||||
	 (res-rv (cml-fork-collecting fds sig-ch thunk)))
 | 
			
		||||
	 (res-rv (cml-fork/collecting fds sig-ch thunk)))
 | 
			
		||||
    (spawn 
 | 
			
		||||
      (lambda ()
 | 
			
		||||
	(let ((results (cml-rv/sync res-rv)))
 | 
			
		||||
	  (cml-sync-ch/send ch (make-job-res (list-ref results 0)
 | 
			
		||||
                                             (list-ref results 1)
 | 
			
		||||
                                             (list-ref results 2)))))
 | 
			
		||||
      (format #t "cml-fork-collecting->rv (no. ~a)\n" id))
 | 
			
		||||
      (format #t "cml-fork/collecting->rv (no. ~a)\n" id))
 | 
			
		||||
    (cml-sync-ch/receive-rv ch)))
 | 
			
		||||
 | 
			
		||||
;;; ->alist?
 | 
			
		||||
| 
						 | 
				
			
			@ -48,7 +48,7 @@
 | 
			
		|||
	 (res-ch (cdr j-des+res-ch))
 | 
			
		||||
	 (to-process-element (cml-sync-ch/make-channel))
 | 
			
		||||
	 (sig-rcv-rv (cml-mcast-ch/mcast-port-receive-rv sig-mport))
 | 
			
		||||
	 (job-res-rv (cml-fork-collecting->rv id j-des to-process-element)))
 | 
			
		||||
	 (job-res-rv (cml-fork/collecting->rv id j-des to-process-element)))
 | 
			
		||||
    (let finish-job ()
 | 
			
		||||
      (cml-rv/select 
 | 
			
		||||
       (cml-rv/wrap sig-rcv-rv
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue