[gegl] gegl-stats: rename "{tile-cache, swap}-total-uncloned" to "-uncompressed"



commit 1ee312311dde5f954d6c8b2b039ec95a6bf348fc
Author: Ell <ell_se yahoo com>
Date:   Mon Dec 17 06:15:26 2018 -0500

    gegl-stats: rename "{tile-cache,swap}-total-uncloned" to "-uncompressed"
    
    In GeglStats, rename the "swap-total-uncloned" property to "swap-
    total-uncompressed", since it now factors the space the swap would
    occupy without *any* form of compression: both block cloning, and
    tile-data compression.
    
    Rename "tile-cache-total-uncloned" to "tile-cache-total-
    uncompressed", for consistency, even though tile cloning is
    currently the only form of compression employed by the cache.

 gegl/buffer/gegl-tile-backend-swap.c  |  2 +-
 gegl/buffer/gegl-tile-backend-swap.h  | 26 +++++++++++++-------------
 gegl/buffer/gegl-tile-handler-cache.c |  2 +-
 gegl/buffer/gegl-tile-handler-cache.h | 12 ++++++------
 gegl/gegl-stats.c                     | 28 ++++++++++++++--------------
 5 files changed, 35 insertions(+), 35 deletions(-)
---
diff --git a/gegl/buffer/gegl-tile-backend-swap.c b/gegl/buffer/gegl-tile-backend-swap.c
index fabee182b..98d48aec6 100644
--- a/gegl/buffer/gegl-tile-backend-swap.c
+++ b/gegl/buffer/gegl-tile-backend-swap.c
@@ -1480,7 +1480,7 @@ gegl_tile_backend_swap_get_total (void)
 }
 
 guint64
-gegl_tile_backend_swap_get_total_uncloned (void)
+gegl_tile_backend_swap_get_total_uncompressed (void)
 {
   return total_uncompressed;
 }
diff --git a/gegl/buffer/gegl-tile-backend-swap.h b/gegl/buffer/gegl-tile-backend-swap.h
index 63e178e90..6e87f3838 100644
--- a/gegl/buffer/gegl-tile-backend-swap.h
+++ b/gegl/buffer/gegl-tile-backend-swap.h
@@ -46,21 +46,21 @@ struct _GeglTileBackendSwap
   GHashTable      *index;
 };
 
-GType      gegl_tile_backend_swap_get_type           (void) G_GNUC_CONST;
+GType      gegl_tile_backend_swap_get_type               (void) G_GNUC_CONST;
 
-guint64    gegl_tile_backend_swap_get_total          (void);
-guint64    gegl_tile_backend_swap_get_total_uncloned (void);
-guint64    gegl_tile_backend_swap_get_file_size      (void);
-gboolean   gegl_tile_backend_swap_get_busy           (void);
-guint64    gegl_tile_backend_swap_get_queued_total   (void);
-gboolean   gegl_tile_backend_swap_get_queue_full     (void);
-gint       gegl_tile_backend_swap_get_queue_stalls   (void);
-gboolean   gegl_tile_backend_swap_get_reading        (void);
-guint64    gegl_tile_backend_swap_get_read_total     (void);
-gboolean   gegl_tile_backend_swap_get_writing        (void);
-guint64    gegl_tile_backend_swap_get_write_total    (void);
+guint64    gegl_tile_backend_swap_get_total              (void);
+guint64    gegl_tile_backend_swap_get_total_uncompressed (void);
+guint64    gegl_tile_backend_swap_get_file_size          (void);
+gboolean   gegl_tile_backend_swap_get_busy               (void);
+guint64    gegl_tile_backend_swap_get_queued_total       (void);
+gboolean   gegl_tile_backend_swap_get_queue_full         (void);
+gint       gegl_tile_backend_swap_get_queue_stalls       (void);
+gboolean   gegl_tile_backend_swap_get_reading            (void);
+guint64    gegl_tile_backend_swap_get_read_total         (void);
+gboolean   gegl_tile_backend_swap_get_writing            (void);
+guint64    gegl_tile_backend_swap_get_write_total        (void);
 
-void       gegl_tile_backend_swap_reset_stats        (void);
+void       gegl_tile_backend_swap_reset_stats            (void);
 
 G_END_DECLS
 
diff --git a/gegl/buffer/gegl-tile-handler-cache.c b/gegl/buffer/gegl-tile-handler-cache.c
index 4c67685ea..e74c8d368 100644
--- a/gegl/buffer/gegl-tile-handler-cache.c
+++ b/gegl/buffer/gegl-tile-handler-cache.c
@@ -962,7 +962,7 @@ gegl_tile_handler_cache_get_total_max (void)
 }
 
 gsize
-gegl_tile_handler_cache_get_total_uncloned (void)
+gegl_tile_handler_cache_get_total_uncompressed (void)
 {
   return cache_total_uncloned;
 }
diff --git a/gegl/buffer/gegl-tile-handler-cache.h b/gegl/buffer/gegl-tile-handler-cache.h
index 60ef7146a..d3447326d 100644
--- a/gegl/buffer/gegl-tile-handler-cache.h
+++ b/gegl/buffer/gegl-tile-handler-cache.h
@@ -71,12 +71,12 @@ void              gegl_tile_handler_cache_remove             (GeglTileHandlerCac
 void              gegl_tile_handler_cache_tile_uncloned      (GeglTileHandlerCache *cache,
                                                               GeglTile             *tile);
 
-gsize             gegl_tile_handler_cache_get_total          (void);
-gsize             gegl_tile_handler_cache_get_total_max      (void);
-gsize             gegl_tile_handler_cache_get_total_uncloned (void);
-gint              gegl_tile_handler_cache_get_hits           (void);
-gint              gegl_tile_handler_cache_get_misses         (void);
+gsize             gegl_tile_handler_cache_get_total              (void);
+gsize             gegl_tile_handler_cache_get_total_max          (void);
+gsize             gegl_tile_handler_cache_get_total_uncompressed (void);
+gint              gegl_tile_handler_cache_get_hits               (void);
+gint              gegl_tile_handler_cache_get_misses             (void);
 
-void              gegl_tile_handler_cache_reset_stats        (void);
+void              gegl_tile_handler_cache_reset_stats            (void);
 
 #endif
diff --git a/gegl/gegl-stats.c b/gegl/gegl-stats.c
index d9d0f7ce1..dafdb3045 100644
--- a/gegl/gegl-stats.c
+++ b/gegl/gegl-stats.c
@@ -34,11 +34,11 @@ enum
   PROP_0,
   PROP_TILE_CACHE_TOTAL,
   PROP_TILE_CACHE_TOTAL_MAX,
-  PROP_TILE_CACHE_TOTAL_UNCLONED,
+  PROP_TILE_CACHE_TOTAL_UNCOMPRESSED,
   PROP_TILE_CACHE_HITS,
   PROP_TILE_CACHE_MISSES,
   PROP_SWAP_TOTAL,
-  PROP_SWAP_TOTAL_UNCLONED,
+  PROP_SWAP_TOTAL_UNCOMPRESSED,
   PROP_SWAP_FILE_SIZE,
   PROP_SWAP_BUSY,
   PROP_SWAP_QUEUED_TOTAL,
@@ -87,10 +87,10 @@ gegl_stats_class_init (GeglStatsClass *klass)
                                                         0, G_MAXUINT64, 0,
                                                         G_PARAM_READABLE));
 
-  g_object_class_install_property (object_class, PROP_TILE_CACHE_TOTAL_UNCLONED,
-                                   g_param_spec_uint64 ("tile-cache-total-uncloned",
-                                                        "Tile Cache total uncloned size",
-                                                        "Total size of tile cache if all tiles were uncloned 
in bytes",
+  g_object_class_install_property (object_class, PROP_TILE_CACHE_TOTAL_UNCOMPRESSED,
+                                   g_param_spec_uint64 ("tile-cache-total-uncompressed",
+                                                        "Tile Cache total uncompressed size",
+                                                        "Total size of tile cache if no compression was 
employed in bytes",
                                                         0, G_MAXUINT64, 0,
                                                         G_PARAM_READABLE));
 
@@ -115,10 +115,10 @@ gegl_stats_class_init (GeglStatsClass *klass)
                                                         0, G_MAXUINT64, 0,
                                                         G_PARAM_READABLE));
 
-  g_object_class_install_property (object_class, PROP_SWAP_TOTAL_UNCLONED,
-                                   g_param_spec_uint64 ("swap-total-uncloned",
-                                                        "Swap total uncloned size",
-                                                        "Total size of if the data in the swap if all the 
entries were uncloned in bytes",
+  g_object_class_install_property (object_class, PROP_SWAP_TOTAL_UNCOMPRESSED,
+                                   g_param_spec_uint64 ("swap-total-uncompressed",
+                                                        "Swap total uncompressed size",
+                                                        "Total size of if the data in the swap if no 
compression was employed in bytes",
                                                         0, G_MAXUINT64, 0,
                                                         G_PARAM_READABLE));
 
@@ -233,8 +233,8 @@ gegl_stats_get_property (GObject    *object,
         g_value_set_uint64 (value, gegl_tile_handler_cache_get_total_max ());
         break;
 
-      case PROP_TILE_CACHE_TOTAL_UNCLONED:
-        g_value_set_uint64 (value, gegl_tile_handler_cache_get_total_uncloned ());
+      case PROP_TILE_CACHE_TOTAL_UNCOMPRESSED:
+        g_value_set_uint64 (value, gegl_tile_handler_cache_get_total_uncompressed ());
         break;
 
       case PROP_TILE_CACHE_HITS:
@@ -249,8 +249,8 @@ gegl_stats_get_property (GObject    *object,
         g_value_set_uint64 (value, gegl_tile_backend_swap_get_total ());
         break;
 
-      case PROP_SWAP_TOTAL_UNCLONED:
-        g_value_set_uint64 (value, gegl_tile_backend_swap_get_total_uncloned ());
+      case PROP_SWAP_TOTAL_UNCOMPRESSED:
+        g_value_set_uint64 (value, gegl_tile_backend_swap_get_total_uncompressed ());
         break;
 
       case PROP_SWAP_FILE_SIZE:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]