Fix logic bug in optimizer, and fix up DEBUG_DEPS compile.

diff --git a/ccan/tdb/tools/replay_trace.c b/ccan/tdb/tools/replay_trace.c
index 0d53f1fea71cb03ea6266adb0417e561a047cc90..db5a07be1cf7c7dd4b3cd7ae18a5770ca1d5ca63 100644 (file)
--- a/ccan/tdb/tools/replay_trace.c
+++ b/ccan/tdb/tools/replay_trace.c
@@ -502,7 +502,8 @@ static void do_pre(char *filename[], unsigned int file, int pre_fd,
 
 #if DEBUG_DEPS
                printf("%s:%u:got pre %u from %s:%u\n", filename[file], i+1,
 
 #if DEBUG_DEPS
                printf("%s:%u:got pre %u from %s:%u\n", filename[file], i+1,

-                      dep->needs_op, dep->satisfies_file, dep->satisfies_op+1);
+                      dep->needs_opnum+1, filename[dep->satisfies_file],
+                      dep->satisfies_opnum+1);

                fflush(stdout);
 #endif
                /* This could be any op, not just this one. */
                fflush(stdout);
 #endif
                /* This could be any op, not just this one. */


@@ -1335,7 +1336,7 @@ static void optimize_dependencies(struct op *op[], unsigned int num_ops[],
                                        continue;
                                }
                                if (prev[dep->satisfies_file]->satisfies_opnum
                                        continue;
                                }
                                if (prev[dep->satisfies_file]->satisfies_opnum

-                                   > dep->satisfies_opnum) {
+                                   < dep->satisfies_opnum) {

                                        talloc_free(prev[dep->satisfies_file]);
                                        prev[dep->satisfies_file] = dep;
                                } else
                                        talloc_free(prev[dep->satisfies_file]);
                                        prev[dep->satisfies_file] = dep;
                                } else