[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm/ CHANGES rpm/rpmdb/ header.c
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2007-10-26 20:50:20
Message-ID: 20071026205020.D8BD3348451 () rpm5 ! org
[Download RAW message or body]

  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:50:20
  Branch: HEAD                             Handle: 2007102621502000

  Modified files:
    rpm                     CHANGES
    rpm/rpmdb               header.c

  Log:
    - jbj: insturment headerNextIterator() statistics.

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

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1757 -r1.1758 CHANGES
  --- rpm/CHANGES	26 Oct 2007 04:00:51 -0000	1.1757
  +++ rpm/CHANGES	26 Oct 2007 20:50:20 -0000	1.1758
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: insturment headerNextIterator() statistics.
       - jbj: trade a double free for a modest memory leak for the moment.
       - jbj: fix: install modes broken by forgetting to add '\0'.
       - jbj: mostly unbork HEAD. --install modes still non-functional.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/header.c
  ============================================================================
  $ cvs diff -u -r1.111 -r1.112 header.c
  --- rpm/rpmdb/header.c	26 Oct 2007 02:50:46 -0000	1.111
  +++ rpm/rpmdb/header.c	26 Oct 2007 20:50:20 -0000	1.112
  @@ -2591,6 +2591,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;
  @@ -2609,11 +2610,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);
   }
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]