* - Writing batches of data to the cloud.
*/
-#if 0
-static void writeback_complete(gpointer a, gpointer i)
-{
- BlueSkyInode *inode = (BlueSkyInode *)i;
-
- if (bluesky_verbose) {
- g_log("bluesky/flushd", G_LOG_LEVEL_DEBUG,
- "Writeback for inode %"PRIu64" complete", inode->inum);
- }
-
- g_mutex_lock(inode->lock);
-
- inode->change_commit = inode->change_pending;
- inode->change_pending = 0;
- if (inode->change_count == inode->change_commit) {
- /* If inode is no longer dirty... */
- inode->change_time = 0;
- g_mutex_lock(inode->fs->lock);
- bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
- inode->dirty_list = NULL;
- g_mutex_unlock(inode->fs->lock);
- }
-
- g_mutex_unlock(inode->lock);
-}
-#endif
-
static void flushd_dirty_inode(BlueSkyInode *inode)
{
BlueSkyFS *fs = inode->fs;
g_mutex_lock(fs->lock);
- bluesky_list_unlink(&fs->dirty_list, inode->dirty_list);
- inode->dirty_list = NULL;
+ bluesky_list_unlink(&fs->unlogged_list, inode->unlogged_list);
+ inode->unlogged_list = NULL;
g_mutex_unlock(fs->lock);
/* Inode is clean; nothing to do. */
if (inode->change_count == inode->change_commit)
return;
- /* Inode writeback is in progress; put back on the dirty list. */
- if (inode->change_pending) {
- /* Waiting for an earlier writeback to finish, so don't start a new
- * writeback yet. */
- g_mutex_lock(fs->lock);
- inode->change_time = bluesky_get_current_time();
- bluesky_list_unlink(&fs->dirty_list, inode->dirty_list);
- inode->dirty_list = bluesky_list_prepend(&fs->dirty_list, inode);
- g_mutex_unlock(fs->lock);
- return;
- }
-
if (bluesky_verbose) {
g_log("bluesky/flushd", G_LOG_LEVEL_DEBUG,
"Starting flush of inode %"PRIu64, inode->inum);
}
- inode->change_pending = inode->change_count;
bluesky_inode_start_sync(inode);
}
int64_t start_time = bluesky_get_current_time();
g_mutex_lock(fs->lock);
+ while (1) {
+ BlueSkyInode *inode;
+ if (fs->unlogged_list.prev == NULL)
+ break;
+ inode = fs->unlogged_list.prev->data;
+
+ if (bluesky_verbose) {
+ g_log("bluesky/flushd", G_LOG_LEVEL_DEBUG,
+ "Considering flushing inode %"PRIu64, inode->inum);
+ }
+
+ /* Stop processing dirty inodes if we both have enough memory available
+ * and the oldest inode is sufficiently new that it need not be flushed
+ * out. */
+ uint64_t elapsed = bluesky_get_current_time() - inode->change_time;
+ if (g_atomic_int_get(&fs->cache_dirty) < bluesky_watermark_low_dirty
+ && elapsed < WRITEBACK_DELAY)
+ break;
+ if (inode->change_time > start_time)
+ break;
+
+ bluesky_inode_ref(inode);
+
+ g_mutex_unlock(fs->lock);
+
+ g_mutex_lock(inode->lock);
+ flushd_dirty_inode(inode);
+ g_mutex_unlock(inode->lock);
+ bluesky_inode_unref(inode);
+
+ g_mutex_lock(fs->lock);
+ }
+
+ g_mutex_unlock(fs->lock);
+}
+
+/* Try to flush dirty data to the cloud. */
+static void flushd_cloud(BlueSkyFS *fs)
+{
+ int64_t start_time = bluesky_get_current_time();
+ g_mutex_lock(fs->lock);
+
while (1) {
BlueSkyInode *inode;
if (fs->dirty_list.prev == NULL)
if (bluesky_verbose) {
g_log("bluesky/flushd", G_LOG_LEVEL_DEBUG,
- "Considering flushing inode %"PRIu64, inode->inum);
+ "Flushing inode %"PRIu64" to cloud", inode->inum);
}
/* Stop processing dirty inodes if we both have enough memory available
g_mutex_lock(inode->lock);
flushd_dirty_inode(inode);
+ g_mutex_lock(fs->lock);
+ bluesky_list_unlink(&fs->dirty_list, inode->dirty_list);
+ inode->dirty_list = NULL;
+ g_mutex_unlock(fs->lock);
+
+ BlueSkyCloudLog *log = inode->committed_item;
+ bluesky_cloudlog_ref(log);
g_mutex_unlock(inode->lock);
+
+ if (log != NULL)
+ bluesky_cloudlog_serialize(log, fs);
bluesky_inode_unref(inode);
+ bluesky_cloudlog_ref(log);
g_mutex_lock(fs->lock);
}
g_mutex_unlock(fs->lock);
+ bluesky_cloudlog_flush(fs);
}
/* Drop cached data for a given inode, if it is clean. inode must be locked. */
bluesky_file_drop_cached(inode);
}
-/* Drop clean data fromt the cache if needed due to memory pressure. */
+/* Drop clean data from the cache if needed due to memory pressure. */
static void flushd_clean(BlueSkyFS *fs)
{
g_mutex_lock(fs->lock);
inode_count = 1;
while (inode_count-- > 0) {
+#if 0
if (g_atomic_int_get(&fs->cache_total) < bluesky_watermark_medium_total)
break;
+#endif
BlueSkyInode *inode;
if (fs->accessed_list.prev == NULL)
if (!g_mutex_trylock(fs->flushd_lock))
return NULL;
flushd_dirty(fs);
- bluesky_cloudlog_write_log(fs);
+ flushd_cloud(fs);
flushd_clean(fs);
g_mutex_unlock(fs->flushd_lock);
void bluesky_flushd_invoke_conditional(BlueSkyFS *fs)
{
if (g_atomic_int_get(&fs->cache_dirty) < bluesky_watermark_high_dirty
- && g_atomic_int_get(&fs->cache_total) < bluesky_watermark_high_total)
+ /*&& g_atomic_int_get(&fs->cache_total) < bluesky_watermark_high_total*/)
return;
if (bluesky_verbose) {
g_log("bluesky/flushd", G_LOG_LEVEL_DEBUG,
- "Too much data; invoking flushd: dirty=%d total=%d",
- g_atomic_int_get(&fs->cache_dirty),
- g_atomic_int_get(&fs->cache_total));
+ "Too much data; invoking flushd: dirty=%d",
+ g_atomic_int_get(&fs->cache_dirty));
}
bluesky_flushd_invoke(fs);