Changeset 1b6b76d in mainline for uspace/app/bithenge/sequence.c

Timestamp:

2012-08-12T05:10:17Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2988aec7

Parents:

6be4142

Message:

Bithenge: improve efficiency by making out_size optional in prefix_apply

File:

• uspace/app/bithenge/sequence.c (modified) (3 diffs)

uspace/app/bithenge/sequence.c

@@ -546 +546 @@
                 return rc;
 
-        rc = seq_node_field_offset(node_as_seq(*out_node), out_size,
-            self->num_subtransforms);
-        if (rc != EOK) {
-                bithenge_node_dec_ref(*out_node);
-                return rc;
+        if (out_size) {
+                rc = seq_node_field_offset(node_as_seq(*out_node), out_size,
+                    self->num_subtransforms);
+                if (rc != EOK) {
+                        bithenge_node_dec_ref(*out_node);
+                        return rc;
+                }
         }
 
@@ -815 +817 @@
                 return rc;
 
-        bithenge_int_t count = node_as_repeat(*out_node)->count;
-        if (count != -1) {
-                rc = seq_node_field_offset(node_as_seq(*out_node), out_size, count);
-                if (rc != EOK) {
-                        bithenge_node_dec_ref(*out_node);
-                        return rc;
-                }
-        } else {
-                *out_size = 0;
-                for (count = 1; ; count++) {
-                        aoff64_t size;
+        if (out_size) {
+                bithenge_int_t count = node_as_repeat(*out_node)->count;
+                if (count != -1) {
                         rc = seq_node_field_offset(node_as_seq(*out_node),
-                            &size, count);
-                        if (rc != EOK)
-                                break;
-                        *out_size = size;
+                            out_size, count);
+                        if (rc != EOK) {
+                                bithenge_node_dec_ref(*out_node);
+                                return rc;
+                        }
+                } else {
+                        *out_size = 0;
+                        for (count = 1; ; count++) {
+                                aoff64_t size;
+                                rc = seq_node_field_offset(
+                                    node_as_seq(*out_node), &size, count);
+                                if (rc != EOK)
+                                        break;
+                                *out_size = size;
+                        }
                 }
         }
@@ -1087 +1092 @@
                 return rc;
 
-        rc = bithenge_node_for_each(*out_node, for_each_noop, NULL);
-        if (rc != EOK) {
-                bithenge_node_dec_ref(*out_node);
-                return rc;
-        }
-
-        rc = seq_node_field_offset(node_as_seq(*out_node), out_size,
-            node_as_do_while(*out_node)->count);
-        if (rc != EOK) {
-                bithenge_node_dec_ref(*out_node);
-                return rc;
+        if (out_size) {
+                rc = bithenge_node_for_each(*out_node, for_each_noop, NULL);
+                if (rc != EOK) {
+                        bithenge_node_dec_ref(*out_node);
+                        return rc;
+                }
+
+                rc = seq_node_field_offset(node_as_seq(*out_node), out_size,
+                    node_as_do_while(*out_node)->count);
+                if (rc != EOK) {
+                        bithenge_node_dec_ref(*out_node);
+                        return rc;
+                }
         }