Changeset 96

Timestamp:

07/03/05 04:58:03 (4 years ago)

Author:

jtv

Message:

Reworked diet mechanism; more debug output; cut deadwood from error diagnosis

Files:

• debian/changelog (modified) (1 diff)
• src/state.c (modified) (3 diffs)
• src/state.h (modified) (1 diff)
• src/swaps.c (modified) (8 diffs)

debian/changelog

@@ -1 +1 @@
-swapspace (1.5) unstable; urgency=low
-
-, should improve
+; improved
-  * Custom signal handlers are now reusable
-  * Signal-triggered stats dump now goes to log if appropriate
-  * New -v|--verbose option logs state transitions and other debug info
+  * Updated documentation
-
-Wed, 29 June 2005 14:1
+Sat, 02 July 2005 15:3
-
-swapspace (1.4) unstable; urgency=low

src/state.c

@@ -78 +78 @@
-
-static enum State the_state = st_hungry;
+static bool need_diet = false;
+
+void request_diet(void) { need_diet = true; }
-
-static void state_to(enum State s)
@@ -93 +96 @@
-void handle_requirements(void)
-{
+  if (unlikely(need_diet))
+  {
+    need_diet = false;
+    state_to(st_diet);
+    return;
+  }
+
-  const memsize_t reqbytes = memory_target();
-
-  timer_tick();
-
@@ -102 +111 @@
-     * memory means we forget what state we're in and jump straight to "hungry"
-     * mode, allocating a new swapfile along the way.  If the allocation fails,
-
+ next time, on alloc_swapfile()'s request
-     */
-    if (likely(alloc_swapfile(reqbytes))) state_to(st_hungry);
-    else state_to(st_diet);
-  }
-  else if (unlikely(timer_timeout()))

src/state.h

@@ -19 +19 @@
-#define SWAPSPACE_STATE_H
-
+/// Perform one iteration of the allocation algorithm.  Clobbers localbuf.
-void handle_requirements(void);
+
+/// Log state information.  Clubbers localbuf.
-void dump_state(void);
+
+/// Request a transition to "diet" state
+void request_diet(void);
-
-#endif

src/swaps.c

@@ -86 +86 @@
-{
-  CHECK_CONFIG_ERR(min_swapsize > max_swapsize);
+  CHECK_CONFIG_ERR(min_swapsize < 10*PAGE_SIZE);
-
-  if (chdir(swappath) == -1)
@@ -185 +186 @@
-/// Populate swapfile by writing data to it
-/**
-
+, or zero on failure
- */
-static memsize_t fill_swapfile(const char file[], int fd, memsize_t size)
-{
-  memsize_t bytes = 0;
-tatic const ssize_t chun
-ssize_t block = chunk
+size_t bloc
+int err = 0
-
-  /* Zero buffer before using it to write data to swapfile.  This doesn't do
@@ -203 +204 @@
-  do
-  {
-
+
+
-    bytes += block;
-block==chunk
+(block > 0 || errno == EINTR)
-
-  if (unlikely(block < 0))
-  {
-    const int err = errno;
-    log_perr_str(LOG_ERR, "Error writing swapfile", file);
-    bytes -= block;
@@ -215 +216 @@
-    {
-    case EFBIG:
-is too large.  Remember how much we were allowed to write
+too big.  Don't try creating files this large again
-      if (likely(bytes > 0 && max_swapsize > bytes))
-
+
+
+
+
+
+
+
+
-      break;
-    case ENOSPC:
-
-
+
+
+
-      break;
+    default:
+        log_msg(LOG_WARNING, "Unexpected error writing swap file");
-    }
+    bytes = 0;
-  }
-
@@ -234 +246 @@
- * @param filename File to be created
- * @param size Desired size in bytes (but already rounded to page size)
-
-
-
-
+
+
- */
-static memsize_t make_swapfile(const char file[], memsize_t size)
@@ -246 +256 @@
-  assert(size == TRUNC_TO_PAGE(size));
-
-  memsize_t realsize;
-
-  if (unlikely(size < min_swapsize)) return 0;
-
@@ -259 +267 @@
-    return 0;
-  }
-
+
+
+
+
+
+
-  close(fd);
-  if (unlikely(realsize < size))
-  {
-    unlink(file);
-    realsize = 0;
-  }
-  
-real
+
-}
-
@@ -560 +568 @@
-  snprintf(file, sizeof(file), "%d", newswap);
-  swapfiles[newswap].size = make_swapfile(file, size);
-
-
-{
-  if (!enable_swapfile(file))
-{
-  unlink(file
-  
-  
-
-}
+
+
+if (!enable_swapfile(file))
+{
+unlink(file);
+request_diet(
+
+
+
+sequence_number = inc_swapno(sequence_number);
-
-  return true;