Ticket #3723: vm_check_17082011.patch

src/bin/Jamfile

@@ -23 +23 @@
 AddResources mimeset : mimeset.rdef ;
 AddResources mountvolume : mountvolume.rdef ;
 AddResources notify : notify.rdef ;
+AddResources swapcheck : swapcheck.rdef ;
 AddResources urlwrapper : urlwrapper.rdef ;
 
 # standard commands that don't need any additional library
@@ -131 +132 @@
 # commands that need libbe.so and liblocale.so
 StdBinCommands
     query.cpp
+    swapcheck.cpp
     : be $(HAIKU_LOCALE_LIBS) : $(haiku-utils_rsrc) ;
 
 # commands that need libbe.so, libsupc++.so and liblocale.so
@@ -234 +236 @@
     : filepanel.cpp
 ;
 
+DoCatalogs swapcheck
+    : x-vnd.Haiku-cmd-swapcheck
+    : swapcheck.cpp
+;
+
 SubInclude HAIKU_TOP src bin addattr ;
 SubInclude HAIKU_TOP src bin bash ;
 SubInclude HAIKU_TOP src bin bc ;

src/bin/swapcheck.rdef

@@ +1 @@
+resource app_signature "application/x-vnd.Haiku-cmd-swapcheck";
+
+resource app_flags B_MULTIPLE_LAUNCH;
+
+resource app_version {
+    major = 1,
+    middle = 0,
+    minor = 0,
+    variety = B_APPV_FINAL,
+    internal = 0,
+    short_info = "Haiku SwapCheck",
+    long_info  = "Haiku SwapCheck ©2011 Haiku, Inc."
+};
+ No newline at end of file

src/bin/swapcheck.cpp

@@ +1 @@
+/*
+ * Copyright 2011, Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *      Hamish Morrison <hamish@lavabit.com>
+ */
+
+#include <stdio.h>
+
+#include <Alert.h>
+#include <Application.h>
+#include <Catalog.h>
+#include <File.h>
+#include <FindDirectory.h>
+#include <kernel/fs_info.h>
+#include <Path.h>
+#include <Roster.h>
+
+#include <driver_settings.h>
+
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "swapcheck"
+
+
+static const char* const kSwapErrorFilePath = "swaperr";
+static const char* const kVirtualMemorySettings = "virtual_memory";
+
+
+int main()
+{
+    // Ensure that the swap error file is not old
+    time_t currentTime = time(NULL);
+    bigtime_t bootTime = (system_time() / 1000000) + 1;
+
+    BPath path;
+    if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path) != B_OK)
+        return 1;
+    path.Append(kSwapErrorFilePath);
+
+    const char* pathString = path.Path();
+    struct stat errFile;
+    if (stat(pathString, &errFile) < 0)
+        return 0;
+
+    time_t modTime = currentTime - errFile.st_mtime;
+    if (modTime >= bootTime) {
+        unlink(pathString);
+        return 0;
+    }
+
+    // Currently all swap errors result in the swap file
+    // being created on the boot device, so update the swap
+    // settings to reflect that.
+    void* settings = load_driver_settings(kVirtualMemorySettings);
+    if (settings != NULL) {
+        const char* enabled = get_driver_parameter(settings,
+            "vm", NULL, NULL);
+        const char* size = get_driver_parameter(settings,
+            "swap_size", NULL, NULL);
+
+        if (enabled != NULL && size != NULL) {
+            BPath path;
+            if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) {
+                path.Append("kernel/drivers");
+                path.Append(kVirtualMemorySettings);
+
+                BFile file;
+                if (file.SetTo(path.Path(),
+                    B_WRITE_ONLY | B_CREATE_FILE | B_ERASE_FILE) == B_OK) {
+                    fs_info info;
+                    fs_stat_dev(dev_for_path("/boot"), &info);
+
+                    char buffer[1024];
+                    snprintf(buffer, sizeof(buffer), "vm %s\nswap_size %s\n"
+                        "swap_volume_name %s\nswap_volume_device %s\n"
+                        "swap_volume_filesystem %s\n"
+                        "swap_volume_capacity %lld\n", enabled, size,
+                        info.volume_name, info.device_name, info.fsh_name,
+                        info.total_blocks * info.block_size);
+                    file.Write(buffer, strlen(buffer));
+                }
+            }
+        }
+        unload_driver_settings(settings);
+    }
+
+    int fd = open(pathString, O_RDONLY);
+    if (fd >= 0) {
+        char buf[8] = { 0 };
+        if (read(fd, &buf, sizeof(buf)) > 0) {
+            BApplication app("application/x-vnd.Haiku-cmd-swapcheck");
+            const char* prompt = NULL;
+            if (strcmp(buf, "nfnd") == 0)
+                prompt = B_TRANSLATE("The system could not locate the "
+                    "specified swap volume at boot time. The boot "
+                    "device has been used instead");
+            else if (strcmp(buf, "nmnt") == 0)
+                prompt = B_TRANSLATE("The system could not mount the "
+                    "specified swap volume at boot time. The boot "
+                    "device has been used instead");
+
+            if (prompt != NULL) {
+                int32 choice = 0;
+                choice = (new BAlert("swapcheck", prompt,
+                    B_TRANSLATE("OK"), B_TRANSLATE("Adjust swap "
+                    "settings" B_UTF8_ELLIPSIS)))->Go();
+                if (choice == 1)
+                    be_roster->Launch("application/x-vnd."
+                        "Haiku-VirtualMemory");
+            }
+
+        }
+        unlink(pathString);
+        close(fd);
+    }
+
+    return 0;
+}

data/system/boot/Bootscript

@@ -170 +170 @@
 # Synchronize network time
 launch system/preferences/Time "" --update
 
+# Check if swap worked
+launch system/bin/swapcheck
+
 if [ "$SAFEMODE" != "yes" ]; then
     # Start user boot script
     if [ -f $HOME/config/boot/UserBootscript ]; then

build/jam/HaikuImage

@@ -55 +55 @@
     safemode screen_blanker screenmode screenshot sdiff setdecor settype
     setversion setvolume seq sha1sum shar shred shuf shutdown sleep sort
     spamdbm
-    split stat strace stty su sum sync sysinfo
+    split stat strace stty su sum swapcheck sync sysinfo
     tac tail tcpdump tcptester tee telnet telnetd test timeout top touch
     tput tr traceroute translate trash true truncate tsort tty
     uname unchop unexpand unmount uniq unlink unrar unshar unzip unzipsfx