socsvn commit: r238796 - soc2012/scher/par_ports/head/Mk

[scher at FreeBSD.org]

Author: scher
Date: Mon Jul  2 11:38:17 2012
New Revision: 238796
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238796

Log:
  [user_feedback] changes in _parv_${_lock_dir}_LOCK_SEQ,
  _parv_${_lock_dir}_LOCK_LOOP,
  _parv_${_lock_dir}_DO_UNLOCK scripts
  

Modified:
  soc2012/scher/par_ports/head/Mk/bsd.parallel.mk

Modified: soc2012/scher/par_ports/head/Mk/bsd.parallel.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.parallel.mk	Mon Jul  2 10:16:14 2012	(r238795)
+++ soc2012/scher/par_ports/head/Mk/bsd.parallel.mk	Mon Jul  2 11:38:17 2012	(r238796)
@@ -207,10 +207,8 @@
 				while true; do \
 					ppid=$$( ps -o ppid -p $${cur_pid} | ${AWK} "NR==2" ); \
 					if [ $${ppid} -eq $${pid} ]; then \
-						${_dparv_START_OUTPUT}; \
-						${ECHO_CMD} "${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}  is locked by parent make process!"; \
-						${ECHO_CMD} "We are allowed to work here"; \
-						${_dparv_END_OUTPUT}; \
+						${ECHO_CMD} "===> ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE} is locked by parent make process."; \
+						${ECHO_CMD} "     We are allowed to work here."; \
 						break; \
 					elif [ $${ppid} -eq 0 ]; then \
 						exit ${_parv_ON_LOCK_EXIT_STATUS}; \
@@ -222,17 +220,13 @@
 				exit ${_parv_ON_LOCK_EXIT_STATUS}; \
 			fi; \
 		else \
-			${_dparv_START_OUTPUT}; \
-			${ECHO_CMD} "Dir: ${${_lock_dir}}   Stalled lock Detected!"; \
-			${ECHO_CMD} "Deleting stalled lock. PID=$${pid}"; \
-			${ECHO_CMD} "Locking: ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}"; \
-			${_dparv_END_OUTPUT}; \
+			${ECHO_CMD} "===> Stalled lock at ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE} file."; \
+			${ECHO_CMD} "     Deleting stalled lock."; \
+			${ECHO_CMD} "===> Locking: ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}"; \
 			${ECHO_CMD} ${.MAKE.PID} >  ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}; \
 		fi; \
 	else \
-		${_dparv_START_OUTPUT}; \
-		${ECHO_CMD} "Locking: ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}"; \
-		${_dparv_END_OUTPUT}; \
+		${ECHO_CMD} "===> Locking: ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}"; \
 		${ECHO_CMD} ${.MAKE.PID} > ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}; \
 	fi
 
@@ -284,11 +278,9 @@
 				exit 0; \
 			elif [ $${status} -eq ${_parv_ON_LOCK_EXIT_STATUS} ]; then \
 				if [ $$(( $${enable_feedback} % ${_parv_ON_LOCK_FEEDBACK_TIMEOUT} )) -eq 0 ]; then \
-					${_dparv_START_OUTPUT}; \
-					${ECHO_CMD} "Unable to lock ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}"; \
-					${ECHO_CMD} "Dir: ${${_lock_dir}}   is already locked by another working process ..."; \
-					${ECHO_CMD} "Waiting for unlock  ........................................................."; \
-					${_dparv_END_OUTPUT}; \
+					${ECHO_CMD} "===> Unable to lock ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}"; \
+					${ECHO_CMD} "     It is already locked by another working process."; \
+					${ECHO_CMD} "     Waiting for unlock ..."; \
 					enable_feedback=0; \
 				fi; \
 				enable_feedback=$$(( $${enable_feedback} + 1 )); \
@@ -311,14 +303,10 @@
 		pid=$$(${CAT} ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}); \
 		if [ ${.MAKE.PID} -eq $${pid} ]; then \
 			${RM} -rf ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}; \
-			${_dparv_START_OUTPUT}; \
-			${ECHO_CMD} Dir: ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}   is unlocked; \
-			${_dparv_END_OUTPUT}; \
+			${ECHO_CMD} "===> Unlocking ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE}"; \
 		else \
-			${_dparv_START_OUTPUT}; \
-			${ECHO_CMD} Dir: ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE} was locked by another process; \
-			${ECHO_CMD} Leave lock file; \
-			${_dparv_END_OUTPUT}; \
+			${ECHO_CMD} "===> ${${_lock_dir}}/${_parv_${_lock_dir}_LOCK_FILE} was locked by another process"; \
+			${ECHO_CMD} "     Leave lock file."; \
 		fi; \
 	}'