Changes in uspace/lib/libblock/libblock.c [1e4cada:ed903174] in mainline

File:

• uspace/lib/libblock/libblock.c (modified) (19 diffs)

uspace/lib/libblock/libblock.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Jakub Jermar 
- * Copyright (c) 2008 Martin Decky 
+ * Copyright (c) 2008 Jakub Jermar
+ * Copyright (c) 2008 Martin Decky
  * All rights reserved.
  *
@@ -52 +52 @@
 #include <macros.h>
 #include <mem.h>
+#include <sys/typefmt.h>
+#include <stacktrace.h>
 
 /** Lock protecting the device connection list */
@@ -79 +81 @@
         size_t comm_size;
         void *bb_buf;
-        bn_t bb_addr;
+        aoff64_t bb_addr;
         size_t pblock_size;             /**< Physical block size. */
         cache_t *cache;
 } devcon_t;
 
-static int read_blocks(devcon_t *devcon, bn_t ba, size_t cnt);
-static int write_blocks(devcon_t *devcon, bn_t ba, size_t cnt);
+static int read_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt);
+static int write_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt);
 static int get_block_size(int dev_phone, size_t *bsize);
+static int get_num_blocks(int dev_phone, aoff64_t *nblocks);
 
 static devcon_t *devcon_search(dev_handle_t dev_handle)
@@ -197 +200 @@
         assert(devcon);
         
+        if (devcon->cache)
+                (void) block_cache_fini(dev_handle);
+
         devcon_remove(devcon);
 
@@ -202 +208 @@
                 free(devcon->bb_buf);
 
-        if (devcon->cache) {
-                hash_table_destroy(&devcon->cache->block_hash);
-                free(devcon->cache);
-        }
-
         munmap(devcon->comm_area, devcon->comm_size);
         ipc_hangup(devcon->dev_phone);
@@ -213 +214 @@
 }
 
-int block_bb_read(dev_handle_t dev_handle, bn_t ba)
+int block_bb_read(dev_handle_t dev_handle, aoff64_t ba)
 {
         void *bb_buf;
@@ -304 +305 @@
 }
 
+int block_cache_fini(dev_handle_t dev_handle)
+{
+        devcon_t *devcon = devcon_search(dev_handle);
+        cache_t *cache;
+        int rc;
+
+        if (!devcon)
+                return ENOENT;
+        if (!devcon->cache)
+                return EOK;
+        cache = devcon->cache;
+        
+        /*
+         * We are expecting to find all blocks for this device handle on the
+         * free list, i.e. the block reference count should be zero. Do not
+         * bother with the cache and block locks because we are single-threaded.
+         */
+        while (!list_empty(&cache->free_head)) {
+                block_t *b = list_get_instance(cache->free_head.next,
+                    block_t, free_link);
+
+                list_remove(&b->free_link);
+                if (b->dirty) {
+                        memcpy(devcon->comm_area, b->data, b->size);
+                        rc = write_blocks(devcon, b->boff, 1);
+                        if (rc != EOK)
+                                return rc;
+                }
+
+                unsigned long key = b->boff;
+                hash_table_remove(&cache->block_hash, &key, 1);
+                
+                free(b->data);
+                free(b);
+        }
+
+        hash_table_destroy(&cache->block_hash);
+        devcon->cache = NULL;
+        free(cache);
+
+        return EOK;
+}
+
 #define CACHE_LO_WATERMARK      10      
 #define CACHE_HI_WATERMARK      20      
@@ -338 +382 @@
  * @return                      EOK on success or a negative error code.
  */
-int block_get(block_t **block, dev_handle_t dev_handle, bn_t boff, int flags)
+int block_get(block_t **block, dev_handle_t dev_handle, aoff64_t boff, int flags)
 {
         devcon_t *devcon;
@@ -613 +657 @@
  * @return              EOK on success or a negative return code on failure.
  */
-int block_seqread(dev_handle_t dev_handle, off_t *bufpos, size_t *buflen,
-    off_t *pos, void *dst, size_t size)
-{
-        off_t offset = 0;
+int block_seqread(dev_handle_t dev_handle, size_t *bufpos, size_t *buflen,
+    aoff64_t *pos, void *dst, size_t size)
+{
+        size_t offset = 0;
         size_t left = size;
         size_t block_size;
@@ -646 +690 @@
                 }
                 
-                if (*bufpos == (off_t) *buflen) {
+                if (*bufpos == *buflen) {
                         /* Refill the communication buffer with a new block. */
                         int rc;
@@ -674 +718 @@
  * @return              EOK on success or negative error code on failure.
  */
-int block_read_direct(dev_handle_t dev_handle, bn_t ba, size_t cnt, void *buf)
+int block_read_direct(dev_handle_t dev_handle, aoff64_t ba, size_t cnt, void *buf)
 {
         devcon_t *devcon;
@@ -702 +746 @@
  * @return              EOK on success or negative error code on failure.
  */
-int block_write_direct(dev_handle_t dev_handle, bn_t ba, size_t cnt,
+int block_write_direct(dev_handle_t dev_handle, aoff64_t ba, size_t cnt,
     const void *data)
 {
@@ -714 +758 @@
 
         memcpy(devcon->comm_area, data, devcon->pblock_size * cnt);
-        rc = read_blocks(devcon, ba, cnt);
+        rc = write_blocks(devcon, ba, cnt);
 
         fibril_mutex_unlock(&devcon->comm_area_lock);
@@ -736 +780 @@
         
         return get_block_size(devcon->dev_phone, bsize);
+}
+
+/** Get number of blocks on device.
+ *
+ * @param dev_handle    Device handle of the block device.
+ * @param nblocks       Output number of blocks.
+ *
+ * @return              EOK on success or negative error code on failure.
+ */
+int block_get_nblocks(dev_handle_t dev_handle, aoff64_t *nblocks)
+{
+        devcon_t *devcon;
+
+        devcon = devcon_search(dev_handle);
+        assert(devcon);
+        
+        return get_num_blocks(devcon->dev_phone, nblocks);
 }
 
@@ -747 +808 @@
  * @return              EOK on success or negative error code on failure.
  */
-static int read_blocks(devcon_t *devcon, bn_t ba, size_t cnt)
+static int read_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt)
 {
         int rc;
@@ -754 +815 @@
         rc = async_req_3_0(devcon->dev_phone, BD_READ_BLOCKS, LOWER32(ba),
             UPPER32(ba), cnt);
+        if (rc != EOK) {
+                printf("Error %d reading %d blocks starting at block %" PRIuOFF64
+                    " from device handle %d\n", rc, cnt, ba,
+                    devcon->dev_handle);
+#ifndef NDEBUG
+                stacktrace_print();
+#endif
+        }
         return rc;
 }
@@ -766 +835 @@
  * @return              EOK on success or negative error code on failure.
  */
-static int write_blocks(devcon_t *devcon, bn_t ba, size_t cnt)
+static int write_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt)
 {
         int rc;
@@ -773 +842 @@
         rc = async_req_3_0(devcon->dev_phone, BD_WRITE_BLOCKS, LOWER32(ba),
             UPPER32(ba), cnt);
+        if (rc != EOK) {
+                printf("Error %d writing %d blocks starting at block %" PRIuOFF64
+                    " to device handle %d\n", rc, cnt, ba, devcon->dev_handle);
+#ifndef NDEBUG
+                stacktrace_print();
+#endif
+        }
         return rc;
 }
@@ -789 +865 @@
 }
 
+/** Get total number of blocks on block device. */
+static int get_num_blocks(int dev_phone, aoff64_t *nblocks)
+{
+        ipcarg_t nb_l, nb_h;
+        int rc;
+
+        rc = async_req_0_2(dev_phone, BD_GET_NUM_BLOCKS, &nb_l, &nb_h);
+        if (rc == EOK) {
+                *nblocks = (aoff64_t) MERGE_LOUP32(nb_l, nb_h);
+        }
+
+        return rc;
+}
+
 /** @}
  */