X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flimit.sh;h=d71e660387dfc9b6b09a0dff5433cebfcb7264a9;hb=6ae9367cddf8565c948f4d9458b07bb688f2ddc2;hp=6c4690ecd78ca932c5bd6f5b92a722069d7bcaa3;hpb=e0e8ba92262736cb481429358140a96a62fa4cd4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/limit.sh b/includes/limit.sh
old mode 100644
new mode 100755
index 6c4690ecd7..d71e660387
--- a/includes/limit.sh
+++ b/includes/limit.sh
@@ -6,6 +6,40 @@
 # and is available on most Linux systems. If Perl was distributed with
 # BSD::Resource included, we would happily use that instead, but it isn't.
 
+# Clean up cgroup
+cleanup() {
+	# First we have to move the current task into a "garbage" group, otherwise
+	# the cgroup will not be empty, and attempting to remove it will fail with
+	# "Device or resource busy"
+	if [ -w "$MW_CGROUP"/tasks ]; then
+		GARBAGE="$MW_CGROUP"
+	else
+		GARBAGE="$MW_CGROUP"/garbage-`id -un`
+		if [ ! -e "$GARBAGE" ]; then
+			mkdir -m 0700 "$GARBAGE"
+		fi
+	fi
+	echo $BASHPID > "$GARBAGE"/tasks
+
+	# Suppress errors in case the cgroup has disappeared due to a release script
+	rmdir "$MW_CGROUP"/$$ 2>/dev/null
+}
+
+updateTaskCount() {
+	# There are lots of ways to count lines in a file in shell script, but this
+	# is one of the few that doesn't create another process, which would
+	# increase the returned number of tasks.
+	readarray < "$MW_CGROUP"/$$/tasks
+	NUM_TASKS=${#MAPFILE[*]}
+}
+
+log() {
+	echo limit.sh: "$*" >&3
+	echo limit.sh: "$*" >&2
+}
+
+MW_INCLUDE_STDERR=
+MW_USE_LOG_PIPE=
 MW_CPU_LIMIT=0
 MW_CGROUP=
 MW_MEM_LIMIT=0
@@ -15,6 +49,14 @@ MW_WALL_CLOCK_LIMIT=0
 # Override settings
 eval "$2"
 
+if [ -n "$MW_INCLUDE_STDERR" ]; then
+	exec 2>&1
+fi
+if [ -z "$MW_USE_LOG_PIPE" ]; then
+	# Open a dummy log FD
+	exec 3>/dev/null
+fi
+
 if [ "$MW_CPU_LIMIT" -gt 0 ]; then
 	ulimit -t "$MW_CPU_LIMIT"
 fi
@@ -22,9 +64,11 @@ if [ "$MW_MEM_LIMIT" -gt 0 ]; then
 	if [ -n "$MW_CGROUP" ]; then
 		# Create cgroup
 		if ! mkdir -m 0700 "$MW_CGROUP"/$$; then
-			echo "limit.sh: failed to create the cgroup." 1>&2
-			exit 1
+			log "failed to create the cgroup."
+			MW_CGROUP=""
 		fi
+	fi
+	if [ -n "$MW_CGROUP" ]; then
 		echo $$ > "$MW_CGROUP"/$$/tasks
 		if [ -n "$MW_CGROUP_NOTIFY" ]; then
 			echo "1" > "$MW_CGROUP"/$$/notify_on_release
@@ -32,7 +76,10 @@ if [ "$MW_MEM_LIMIT" -gt 0 ]; then
 		# Memory
 		echo $(($MW_MEM_LIMIT*1024)) > "$MW_CGROUP"/$$/memory.limit_in_bytes
 		# Memory+swap
-		echo $(($MW_MEM_LIMIT*1024)) > "$MW_CGROUP"/$$/memory.memsw.limit_in_bytes
+		# This will be missing if there is no swap
+		if [ -e "$MW_CGROUP"/$$/memory.memsw.limit_in_bytes ]; then
+			echo $(($MW_MEM_LIMIT*1024)) > "$MW_CGROUP"/$$/memory.memsw.limit_in_bytes
+		fi
 	else
 		ulimit -v "$MW_MEM_LIMIT"
 	fi
@@ -43,43 +90,16 @@ if [ "$MW_FILE_SIZE_LIMIT" -gt 0 ]; then
 	ulimit -f "$MW_FILE_SIZE_LIMIT"
 fi
 if [ "$MW_WALL_CLOCK_LIMIT" -gt 0 -a -x "/usr/bin/timeout" ]; then
-	/usr/bin/timeout $MW_WALL_CLOCK_LIMIT /bin/bash -c "$1"
+	/usr/bin/timeout $MW_WALL_CLOCK_LIMIT /bin/bash -c "$1" 3>&-
 	STATUS="$?"
 	if [ "$STATUS" == 124 ]; then
-		echo "limit.sh: timed out." 1>&2
+		log "timed out executing command \"$1\""
 	fi
 else
-	eval "$1"
+	eval "$1" 3>&-
 	STATUS="$?"
 fi
 
-# Clean up cgroup
-cleanup() {
-	# First we have to move the current task into a "garbage" group, otherwise
-	# the cgroup will not be empty, and attempting to remove it will fail with
-	# "Device or resource busy"
-	if [ -w "$MW_CGROUP"/tasks ]; then
-		GARBAGE="$MW_CGROUP"
-	else
-		GARBAGE="$MW_CGROUP"/garbage-"$USER"
-		if [ ! -e "$GARBAGE" ]; then
-			mkdir -m 0700 "$GARBAGE"
-		fi
-	fi
-	echo $BASHPID > "$GARBAGE"/tasks
-
-	# Suppress errors in case the cgroup has disappeared due to a release script
-	rmdir "$MW_CGROUP"/$$ 2>/dev/null
-}
-
-updateTaskCount() {
-	# There are lots of ways to count lines in a file in shell script, but this
-	# is one of the few that doesn't create another process, which would
-	# increase the returned number of tasks.
-	readarray < "$MW_CGROUP"/$$/tasks
-	NUM_TASKS=${#MAPFILE[*]}
-}
-
 if [ -n "$MW_CGROUP" ]; then
 	updateTaskCount
 
@@ -92,7 +112,7 @@ if [ -n "$MW_CGROUP" ]; then
 				updateTaskCount
 			done
 			cleanup
-		) >&/dev/null < /dev/null &
+		) >&/dev/null < /dev/null 3>&- &
 		disown -a
 	else
 		cleanup