fix: Kill QEMU after 5 seconds if it hangs (#1088)

.devcontainer/codespaces.yml

@@ -1,9 +1,8 @@
 services:
   dsm:
     container_name: dsm
-    image: vdsm/virtual-dsm
+    image: ghcr.io/vdsm/virtual-dsm
     environment:
-      ALLOCATE: "Y"
       RAM_SIZE: "half"
       DISK_SIZE: "max"
       CPU_CORES: "max"

.devcontainer/devcontainer.json

@@ -1,18 +1,17 @@
 {
   "name": "Virtual DSM",
-  "service": "dsm",
+  "service": "vdsm",
-  "containerEnv": {
-    "ALLOCATE": "Y"
-  },  
   "forwardPorts": [5000],
   "portsAttributes": {
     "5000": {
       "label": "Web",
-      "onAutoForward": "openBrowser"
+      "onAutoForward": "notify"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "silent"
+    "onAutoForward": "ignore"
   }, 
-  "dockerComposeFile": "codespaces.yml"
+  "dockerComposeFile": "codespaces.yml",
+  "workspaceFolder": "/workspaces/vdsm",
+  "initializeCommand": "docker system prune --all --force"
 }

src/power.sh

@@ -33,6 +33,7 @@ _trap() {
 finish() {
 
   local pid
+  local cnt=0
   local reason=$1
 
   touch "$QEMU_END"
@@ -40,14 +41,24 @@ finish() {
   if [ -s "$QEMU_PID" ]; then
 
     pid=$(<"$QEMU_PID")
-    echo && error "Forcefully terminating QEMU process, reason: $reason..."
+    echo && error "Forcefully terminating Virtual DSM, reason: $reason..."
     { kill -15 "$pid" || true; } 2>/dev/null
 
     while isAlive "$pid"; do
+
       sleep 1
+      cnt=$((cnt+1))
+
       # Workaround for zombie pid
       [ ! -s "$QEMU_PID" ] && break
+
+      if [ "$cnt" == "5" ]; then
+        echo && error "QEMU did not terminate itself, forcefully killing process..."
+        { kill -9 "$pid" || true; } 2>/dev/null
+      fi
+
     done
+
   fi
 
   fKill "print.sh"

src/progress.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
+info="/run/shm/msg.html"
+
 escape () {
     local s
     s=${1//&/\&}
@@ -11,28 +13,33 @@ escape () {
     return 0
 }
 
-file="$1"
+path="$1"
 total="$2"
 body=$(escape "$3")
-info="/run/shm/msg.html"
 
 if [[ "$body" == *"..." ]]; then
-  body="<p class=\"loading\">${body/.../}</p>"
+  body="<p class=\"loading\">${body::-3}</p>"
 fi
 
 while true
 do
-  if [ -s "$file" ]; then
+
-    bytes=$(du -sb "$file" | cut -f1)
+  if [ ! -s "$path" ] && [ ! -d "$path" ]; then
-    if (( bytes > 1000 )); then
+    bytes="0"
-      if [ -z "$total" ] || [[ "$total" == "0" ]] || [ "$bytes" -gt "$total" ]; then
+  else
-        size=$(numfmt --to=iec --suffix=B "$bytes" | sed -r 's/([A-Z])/ \1/')
+    bytes=$(du -sb "$path" | cut -f1)
-      else
-        size="$(echo "$bytes" "$total" | awk '{printf "%.1f", $1 * 100 / $2}')"
-        size="$size%"
-      fi
-      echo "${body//(\[P\])/($size)}"> "$info"
-    fi
   fi
+  
+  if (( bytes > 4096 )); then
+    if [ -z "$total" ] || [[ "$total" == "0" ]] || [ "$bytes" -gt "$total" ]; then
+      size=$(numfmt --to=iec --suffix=B "$bytes" | sed -r 's/([A-Z])/ \1/')
+    else
+      size="$(echo "$bytes" "$total" | awk '{printf "%.1f", $1 * 100 / $2}')"
+      size="$size%"
+    fi
+    [[ "$size" != "0.0%" ]] && echo "${body//(\[P\])/($size)}"> "$info"
+  fi
+
   sleep 1 & wait $!
+
 done