Attachment 33683 Details for Bug 26834 – speed up patch

[patch] speed up patch

0001-Speed-up-get_overall-and-get_bad.patch (text/plain), 6.31 KB, created by Martin Pitt on 2010-03-02 01:31:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Pitt

Created: 2010-03-02 01:31:17 UTC

Size: 6.31 KB

patch

obsolete

>From 2b24de1dc2314c28bce6e89050f16aa0dcac8031 Mon Sep 17 00:00:00 2001
>From: Martin Pitt <martin.pitt@ubuntu.com>
>Date: Tue, 2 Mar 2010 09:58:59 +0100
>Subject: [PATCH] Speed up get_overall() and get_bad()
>
>Instead of iterating through all attributes four times for an
>sk_disk_smart_get_overall() call, just do it once and store the results in
>SkDisk. This considerably speeds up libatasmart for common operations like
>smart_get_overall() and smart_get_bad().
>
>https://bugs.freedesktop.org/show_bug.cgi?id=26834
>---
> atasmart.c |   97 +++++++++++++++++++++++++++--------------------------------
> 1 files changed, 44 insertions(+), 53 deletions(-)
>
>diff --git a/atasmart.c b/atasmart.c
>index a4b60c0..13d55ff 100644
>--- a/atasmart.c
>+++ b/atasmart.c
>@@ -122,6 +122,15 @@ struct SkDisk {
>         SkIdentifyParsedData identify_parsed_data;
>         SkSmartParsedData smart_parsed_data;
> 
>+        /* cache for commonly used attributes */
>+        SkBool attribute_cache_valid:1;
>+        SkBool bad_attribute_now:1;
>+        SkBool bad_attribute_in_the_past:1;
>+        SkBool reallocated_sector_count_found:1;
>+        SkBool current_pending_sector_found:1;
>+        uint64_t reallocated_sector_count;
>+        uint64_t current_pending_sector;
>+
>         void *blob;
> };
> 
>@@ -2015,64 +2024,61 @@ int sk_disk_smart_get_power_cycle(SkDisk *d, uint64_t *count) {
>         return 0;
> }
> 
>-static void reallocated_cb(SkDisk *d, const SkSmartAttributeParsedData *a, struct attr_helper *ah) {
>-
>-        if (a->pretty_unit != SK_SMART_ATTRIBUTE_UNIT_SECTORS)
>-                return;
>-
>-        if (!strcmp(a->name, "reallocated-sector-count")) {
>+static void fill_cache_cb(SkDisk *d, const SkSmartAttributeParsedData *a, void* userdata) {
> 
>-                if (!ah->found || a->pretty_value > *ah->value)
>-                        *ah->value = a->pretty_value;
>+        if (a->prefailure) {
>+                if (a->good_now_valid && !a->good_now)
>+                    d->bad_attribute_now = TRUE;
> 
>-                ah->found = TRUE;
>+                if (a->good_in_the_past_valid && !a->good_in_the_past)
>+                    d->bad_attribute_in_the_past = TRUE;
>         }
>-}
>-
>-static void pending_cb(SkDisk *d, const SkSmartAttributeParsedData *a, struct attr_helper *ah) {
> 
>         if (a->pretty_unit != SK_SMART_ATTRIBUTE_UNIT_SECTORS)
>                 return;
> 
>+        if (!strcmp(a->name, "reallocated-sector-count")) {
>+                if (a->pretty_value > d->reallocated_sector_count)
>+                        d->reallocated_sector_count = a->pretty_value;
>+                d->reallocated_sector_count_found = TRUE;
>+        }
>+
>         if (!strcmp(a->name, "current-pending-sector")) {
>+                if (a->pretty_value > d->current_pending_sector)
>+                        d->current_pending_sector = a->pretty_value;
>+                d->current_pending_sector_found = TRUE;
>+        }
>+}
> 
>-                if (!ah->found || a->pretty_value > *ah->value)
>-                        *ah->value = a->pretty_value;
>+static int fill_cache(SkDisk *d) {
>+        if (d->attribute_cache_valid)
>+                return 0;
> 
>-                ah->found = TRUE;
>-        }
>+        if (sk_disk_smart_parse_attributes(d, (SkSmartAttributeParseCallback) fill_cache_cb, NULL) >= 0) {
>+                d->attribute_cache_valid = TRUE;
>+                return 0;
>+        } else
>+                return -1;
> }
> 
> int sk_disk_smart_get_bad(SkDisk *d, uint64_t *sectors) {
>-        struct attr_helper ah1, ah2;
>-        uint64_t sectors1, sectors2;
>-
>         assert(d);
>         assert(sectors);
> 
>-        ah1.found = FALSE;
>-        ah1.value = &sectors1;
>-
>-        if (sk_disk_smart_parse_attributes(d, (SkSmartAttributeParseCallback) reallocated_cb, &ah1) < 0)
>+        if (fill_cache (d) < 0)
>                 return -1;
> 
>-        ah2.found = FALSE;
>-        ah2.value = &sectors2;
>-
>-        if (sk_disk_smart_parse_attributes(d, (SkSmartAttributeParseCallback) pending_cb, &ah2) < 0)
>-                return -1;
>-
>-        if (!ah1.found && !ah2.found) {
>+        if (!d->reallocated_sector_count_found && !d->current_pending_sector_found) {
>                 errno = ENOENT;
>                 return -1;
>         }
> 
>-        if (ah1.found && ah2.found)
>-                *sectors = sectors1 + sectors2;
>-        else if (ah1.found)
>-                *sectors = sectors1;
>+        if (d->reallocated_sector_count_found && d->current_pending_sector_found)
>+                *sectors = d->reallocated_sector_count + d->current_pending_sector;
>+        else if (d->reallocated_sector_count_found)
>+                *sectors = d->reallocated_sector_count;
>         else
>-                *sectors = sectors2;
>+                *sectors = d->current_pending_sector;
> 
>         return 0;
> }
>@@ -2096,16 +2102,6 @@ const char* sk_smart_overall_to_string(SkSmartOverall overall) {
>         return _P(map[overall]);
> }
> 
>-static void bad_attribute_now_cb(SkDisk *d, const SkSmartAttributeParsedData *a, SkBool *good) {
>-        if (a->prefailure && a->good_now_valid && !a->good_now)
>-                *good = FALSE;
>-}
>-
>-static void bad_attribute_in_the_past_cb(SkDisk *d, const SkSmartAttributeParsedData *a, SkBool *good) {
>-        if (a->prefailure && a->good_in_the_past_valid && !a->good_in_the_past)
>-                *good = FALSE;
>-}
>-
> static uint64_t u64log2(uint64_t n) {
>         unsigned r;
> 
>@@ -2156,11 +2152,10 @@ int sk_disk_smart_get_overall(SkDisk *d, SkSmartOverall *overall) {
>         }
> 
>         /* Third, check if any of the SMART attributes is bad */
>-        good = TRUE;
>-        if (sk_disk_smart_parse_attributes(d, (SkSmartAttributeParseCallback) bad_attribute_now_cb, &good) < 0)
>+        if (fill_cache (d) < 0)
>                 return -1;
> 
>-        if (!good) {
>+        if (d->bad_attribute_now) {
>                 *overall = SK_SMART_OVERALL_BAD_ATTRIBUTE_NOW;
>                 return 0;
>         }
>@@ -2172,11 +2167,7 @@ int sk_disk_smart_get_overall(SkDisk *d, SkSmartOverall *overall) {
>         }
> 
>         /* Fifth, check if any of the SMART attributes ever was bad */
>-        good = TRUE;
>-        if (sk_disk_smart_parse_attributes(d, (SkSmartAttributeParseCallback) bad_attribute_in_the_past_cb, &good) < 0)
>-                return -1;
>-
>-        if (!good) {
>+        if (d->bad_attribute_in_the_past) {
>                 *overall = SK_SMART_OVERALL_BAD_ATTRIBUTE_IN_THE_PAST;
>                 return 0;
>         }
>-- 
>1.7.0
>

Actions: View | Splinter Review

Attachments on bug 26834: 33683

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.