RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   26-Oct-2007 22:52:09
  Branch: rpm-4_5                          Handle: 2007102621520801

  Modified files:           (Branch: rpm-4_5)
    rpm                     CHANGES
    rpm/rpmdb               header.c

  Log:
    - jbj: insturment headerNextIterator() statistics (noop in rpm-4.5).

  Summary:
    Revision    Changes     Path
    1.1360.2.52 +1  -0      rpm/CHANGES
    1.48.2.20   +6  -0      rpm/rpmdb/header.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1360.2.51 -r1.1360.2.52 CHANGES
  --- rpm/CHANGES	26 Oct 2007 02:06:42 -0000	1.1360.2.51
  +++ rpm/CHANGES	26 Oct 2007 20:52:08 -0000	1.1360.2.52
  @@ -1,4 +1,5 @@
   4.4.9 -> 4.5:
  +    - jbj: insturment headerNextIterator() statistics (noop in rpm-4.5).
       - jbj: enlarge scope of he->avail test to include header extension cache.
       - jbj: backport header tag/format extensions, reverting element arg hackery.
       - jbj: eliminate unused end-of-array check.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.c
  ============================================================================
  $ cvs diff -u -r1.48.2.19 -r1.48.2.20 header.c
  --- rpm/rpmdb/header.c	26 Oct 2007 02:24:36 -0000	1.48.2.19
  +++ rpm/rpmdb/header.c	26 Oct 2007 20:52:09 -0000	1.48.2.20
  @@ -2391,6 +2391,7 @@
   	/*@requires maxSet(tag) >= 0 /\ maxSet(type) >= 0
   		/\ maxSet(p) >= 0 /\ maxSet(c) >= 0 @*/
   {
  +    void * sw;
       Header h = hi->h;
       int slot = hi->next_index;
       indexEntry entry = NULL;
  @@ -2409,11 +2410,16 @@
       hi->next_index++;
       /*@=noeffect@*/
   
  +    if ((sw = headerGetStats(h, 19)) != NULL)	/* RPMTS_OP_HDRGET */
  +	(void) rpmswEnter(sw, 0);
  +
       if (tag)
   	*tag = entry->info.tag;
   
       rc = copyEntry(entry, (rpmTagType *)type, (rpmTagData *)p, (rpmTagCount *)c, 0);
   
  +    if (sw != NULL)	(void) rpmswExit(sw, 0);
  +
       /* XXX 1 on success */
       return ((rc == 1) ? 1 : 0);
   }
  @@ .