3222. [cleanup] Replace dns_journal_{get,set}_bitws with

                        dns_journal_{get,set}_sourceserial. [RT #26634]

diff --git a/CHANGES b/CHANGES
index 1acfa27fe4015953937db7fc98bc12b972822069..d6ca74d2b4ea401f684815ce562e1d166f87fe39 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3222.  [cleanup]       Replace dns_journal_{get,set}_bitws with
+                       dns_journal_{get,set}_sourceserial. [RT #26634]
+
 3221.  [bug]           Fixed a potential coredump on shutdown due to
                        referencing fetch context after it's been freed.
                        [RT #26720]

diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h
index a1ccdb6195c0b1958ed246b443bdef2aa4899089..ccd30b5f4c50bf802e77bda0040e37b1ce69e38e 100644 (file)
--- a/lib/dns/include/dns/journal.h
+++ b/lib/dns/include/dns/journal.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journal.h,v 1.39 2011/08/30 23:46:53 tbox Exp $ */
+/* $Id: journal.h,v 1.40 2011/11/28 03:14:59 marka Exp $ */
 
 #ifndef DNS_JOURNAL_H
 #define DNS_JOURNAL_H 1
@@ -288,11 +288,11 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial,
  */
 
 isc_uint32_t
-dns_journal_get_bitws(dns_journal_t *j);
+dns_journal_get_sourceserial(dns_journal_t *j);
 void
-dns_journal_set_bitws(dns_journal_t *j, isc_uint32_t bitws);
+dns_journal_set_sourceserial(dns_journal_t *j, isc_uint32_t sourceserial);
 /*%<
- * Get and set bump in the wire serial.
+ * Get and set source serial.
  */
 
 ISC_LANG_ENDDECLS

diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 96297d50647560a35ec37ea48583525b253ee172..7cdc1d48fca17904e1aa245763e0deedd79a2566 100644 (file)
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journal.c,v 1.116 2011/08/30 23:46:52 tbox Exp $ */
+/* $Id: journal.c,v 1.117 2011/11/28 03:14:58 marka Exp $ */
 
 #include <config.h>
 
@@ -213,8 +213,8 @@ typedef union {
                journal_rawpos_t        end;
                /*% Number of index entries following the header. */
                unsigned char           index_size[4];
-               /*% Bump in the wire serial. */
-               unsigned char           bitws[4];
+               /*% Source serial number. */
+               unsigned char           sourceserial[4];
        } h;
        /* Pad the header to a fixed size. */
        unsigned char pad[JOURNAL_HEADER_SIZE];
@@ -254,7 +254,7 @@ typedef struct {
        journal_pos_t   begin;
        journal_pos_t   end;
        isc_uint32_t    index_size;
-       isc_uint32_t    bitws;
+       isc_uint32_t    sourceserial;
 } journal_header_t;
 
 /*%
@@ -296,7 +296,7 @@ typedef enum {
        JOURNAL_STATE_READ,
        JOURNAL_STATE_WRITE,
        JOURNAL_STATE_TRANSACTION,
-       JOURNAL_STATE_BITWS
+       JOURNAL_STATE_INLINE
 } journal_state_t;
 
 struct dns_journal {
@@ -357,7 +357,7 @@ journal_header_decode(journal_rawheader_t *raw, journal_header_t *cooked) {
        journal_pos_decode(&raw->h.begin, &cooked->begin);
        journal_pos_decode(&raw->h.end, &cooked->end);
        cooked->index_size = decode_uint32(raw->h.index_size);
-       cooked->bitws = decode_uint32(raw->h.bitws);
+       cooked->sourceserial = decode_uint32(raw->h.sourceserial);
 }
 
 static void
@@ -368,7 +368,7 @@ journal_header_encode(journal_header_t *cooked, journal_rawheader_t *raw) {
        journal_pos_encode(&raw->h.begin, &cooked->begin);
        journal_pos_encode(&raw->h.end, &cooked->end);
        encode_uint32(cooked->index_size, raw->h.index_size);
-       encode_uint32(cooked->bitws, raw->h.bitws);
+       encode_uint32(cooked->sourceserial, raw->h.sourceserial);
 }
 
 /*
@@ -955,7 +955,7 @@ dns_journal_begin_transaction(dns_journal_t *j) {
 
        REQUIRE(DNS_JOURNAL_VALID(j));
        REQUIRE(j->state == JOURNAL_STATE_WRITE ||
-               j->state == JOURNAL_STATE_BITWS);
+               j->state == JOURNAL_STATE_INLINE);
 
        /*
         * Find the file offset where the new transaction should
@@ -1079,12 +1079,12 @@ dns_journal_commit(dns_journal_t *j) {
 
        REQUIRE(DNS_JOURNAL_VALID(j));
        REQUIRE(j->state == JOURNAL_STATE_TRANSACTION ||
-               j->state == JOURNAL_STATE_BITWS);
+               j->state == JOURNAL_STATE_INLINE);
 
        /*
         * Just write out a updated header.
         */
-       if (j->state == JOURNAL_STATE_BITWS) {
+       if (j->state == JOURNAL_STATE_INLINE) {
                CHECK(journal_fsync(j));
                journal_header_encode(&j->header, &rawheader);
                CHECK(journal_seek(j, 0));
@@ -1166,7 +1166,7 @@ dns_journal_commit(dns_journal_t *j) {
         */
        if (JOURNAL_EMPTY(&j->header)) {
                j->header.begin = j->x.pos[0];
-               j->header.bitws = j->header.begin.serial;
+               j->header.sourceserial = j->header.begin.serial;
        }
        j->header.end = j->x.pos[1];
        journal_header_encode(&j->header, &rawheader);
@@ -1445,7 +1445,7 @@ dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) {
                return (result);
        }
 
-       fprintf(file, "BITWS = %u\n", j->header.bitws);
+       fprintf(file, "Source serial = %u\n", j->header.sourceserial);
        dns_diff_init(j->mctx, &diff);
 
        /*
@@ -1539,20 +1539,20 @@ dns_journal_last_serial(dns_journal_t *j) {
 }
 
 void
-dns_journal_set_bitws(dns_journal_t *j, isc_uint32_t bitws) {
+dns_journal_set_sourceserial(dns_journal_t *j, isc_uint32_t sourceserial) {
 
        REQUIRE(j->state == JOURNAL_STATE_WRITE ||
-               j->state == JOURNAL_STATE_BITWS ||
+               j->state == JOURNAL_STATE_INLINE ||
                j->state == JOURNAL_STATE_TRANSACTION);
 
-       j->header.bitws = bitws;
+       j->header.sourceserial = sourceserial;
        if (j->state == JOURNAL_STATE_WRITE)
-               j->state = JOURNAL_STATE_BITWS;
+               j->state = JOURNAL_STATE_INLINE;
 }
 
 isc_uint32_t
-dns_journal_get_bitws(dns_journal_t *j) {
-       return (j->header.bitws);
+dns_journal_get_sourceserial(dns_journal_t *j) {
+       return (j->header.sourceserial);
 }
 
 /**************************************************************************/
@@ -2195,7 +2195,7 @@ dns_journal_compact(isc_mem_t *mctx, char *filename, isc_uint32_t serial,
                new->header.begin.offset = indexend;
                new->header.end.serial = j->header.end.serial;
                new->header.end.offset = indexend + copy_length;
-               new->header.bitws = j->header.bitws;
+               new->header.sourceserial = j->header.sourceserial;
 
                /*
                 * Update the journal header.

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 9f06a7cd6f9055653f9696202bbbf416aa83c90e..54f2764d73c8dbab0bc4f3ca395e12b78191b1fe 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.647 2011/11/04 05:51:01 each Exp $ */
+/* $Id: zone.c,v 1.648 2011/11/28 03:14:58 marka Exp $ */
 
 /*! \file */
 
@@ -3227,7 +3227,7 @@ update_soa_serial(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff,
  * Write all transactions in 'diff' to the zone journal file.
  */
 static isc_result_t
-zone_journal(dns_zone_t *zone, dns_diff_t *diff, isc_uint32_t *bitws,
+zone_journal(dns_zone_t *zone, dns_diff_t *diff, isc_uint32_t *sourceserial,
             const char *caller)
 {
        const char me[] = "zone_journal";
@@ -3246,8 +3246,8 @@ zone_journal(dns_zone_t *zone, dns_diff_t *diff, isc_uint32_t *bitws,
                                     caller, dns_result_totext(result));
                        return (result);
                }
-               if (bitws != NULL)
-                       dns_journal_set_bitws(journal, *bitws);
+               if (sourceserial != NULL)
+                       dns_journal_set_sourceserial(journal, *sourceserial);
 
                result = dns_journal_write_transaction(journal, diff);
                dns_journal_destroy(&journal);
@@ -12036,9 +12036,9 @@ receive_secure_serial(isc_task_t *task, isc_event_t *event) {
        if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND)
                goto failure;
 
-       start = dns_journal_get_bitws(rjournal);
+       start = dns_journal_get_sourceserial(rjournal);
        if (sjournal != NULL) {
-               isc_uint32_t serial = dns_journal_get_bitws(sjournal);
+               isc_uint32_t serial = dns_journal_get_sourceserial(sjournal);
                /*
                 * We write the secure journal first so if that exists
                 * use its value provided it is greater that from the
@@ -12140,7 +12140,7 @@ receive_secure_serial(isc_task_t *task, isc_event_t *event) {
 
        CHECK(zone_journal(zone, &diff, &end, "receive_secure_serial"));
 
-       dns_journal_set_bitws(rjournal, end);
+       dns_journal_set_sourceserial(rjournal, end);
        dns_journal_commit(rjournal);
 
        LOCK_ZONE(zone);