upstream/mercurial-mirror Files · mercurial/util.h

bdiff: don't check border condition in loop...

bdiff: don't check border condition in loop `plast = a + len - 1`. So, this "for" loop iterates from "a" to "plast", inclusive. So, `p == plast` can only be true on the final iteration of the loop. So checking for it on every loop iteration is wasteful. This patch simply decreases the upper bound of the loop by 1 and adds an explicit check after iteration for the `p == plast` case. We can't simply add 1 to the initial value for "i" because that doesn't do the correct thing on empty input strings. `perfbdiff -m 3041e4d59df2` on the Firefox repo becomes significantly faster: ! wall 0.072763 comb 0.070000 user 0.070000 sys 0.000000 (best of 100) ! wall 0.053221 comb 0.060000 user 0.060000 sys 0.000000 (best of 100) For the curious, this code has its origins in 8b067bde6679, which is the changeset that introduced bdiff.c in 2005. Also, GNU diffutils is able to perform a similar line-based diff in under 20ms. So there's likely more perf wins to be found in this code. One of them is the hashing algorithm. But it looks like mpm spent some time testing hash collisions in d0c48891dd4a. I'd like to do the same before switching away from lyhash, just to be on the safe side.

Gregory Szorc - - Load All Authors

File last commit:

r30112:9b6ff0f9 default


                r30308:d500ddae

default

Download file

             util.h
        
                    45 lines
            
             | 981 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / util.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Renato Cunha
    
util.h: Utility macros for handling different Python APIs....

              r11358
            
      /*

       util.h - utility functions for interfacing with the various python APIs.

       This software may be used and distributed according to the terms of

       the GNU General Public License, incorporated herein by reference.

      */

      #ifndef _HG_UTIL_H_

      #define _HG_UTIL_H_

        Maciej Fijalkowski
    
internals: move the bitmanipulation routines into its own file...

              r29444
            
      #include "compat.h"

        Renato Cunha
    
util.h: Utility macros for handling different Python APIs....

              r11358
            
      #if PY_MAJOR_VERSION >= 3

      #define IS_PY3K

        Gregory Szorc
    
parsers: move PyInt aliasing out of util.h...

              r30112
            
      #endif

        Renato Cunha
    
util.h: Utility macros for handling different Python APIs....

              r11358
            
        Siddharth Agarwal
    
parsers: inline fields of dirstate values in C version...

              r21809
            
      typedef struct {

      	PyObject_HEAD

      	char state;

      	int mode;

      	int size;

      	int mtime;

      } dirstateTupleObject;

        André Sintzoff
    
util.h: declare dirstateTupleType variable instead of defining it...

              r21838
            
      extern PyTypeObject dirstateTupleType;

        Siddharth Agarwal
    
parsers: inline fields of dirstate values in C version...

              r21809
            
      #define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateTupleType)

        Siddharth Agarwal
    
util.h: define an enum for normcase specs...

              r24608
            
      /* This should be kept in sync with normcasespecs in encoding.py. */

      enum normcase_spec {

      	NORMCASE_LOWER = -1,

      	NORMCASE_UPPER = 1,

      	NORMCASE_OTHER = 0

      };

        Laurent Charignon
    
phase: compute phases in C...

              r24443
            
      #define MIN(a, b) (((a)<(b))?(a):(b))

        Matt Mackall
    
manifest: move C bool polyfill into util.h

              r24442
            
      /* VC9 doesn't include bool and lacks stdbool.h based on my searching */

        Kevin Bullock
    
util: fix the check for non-C99 compilers (issue4605)

              r24829
            
      #if defined(_MSC_VER) || __STDC_VERSION__ < 199901L

        Matt Mackall
    
manifest: move C bool polyfill into util.h

              r24442
            
      #define true 1

      #define false 0

      typedef unsigned char bool;

      #else

      #include <stdbool.h>

      #endif

        Renato Cunha
    
util.h: Utility macros for handling different Python APIs....

              r11358
            
      #endif /* _HG_UTIL_H_ */

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Renato Cunha util.h: Utility macros for handling different Python APIs....	r11358	/*
		util.h - utility functions for interfacing with the various python APIs.

		This software may be used and distributed according to the terms of
		the GNU General Public License, incorporated herein by reference.
		*/

		#ifndef _HG_UTIL_H_
		#define _HG_UTIL_H_

Maciej Fijalkowski internals: move the bitmanipulation routines into its own file...	r29444	#include "compat.h"

Renato Cunha util.h: Utility macros for handling different Python APIs....	r11358	#if PY_MAJOR_VERSION >= 3
		#define IS_PY3K
Gregory Szorc parsers: move PyInt aliasing out of util.h...	r30112	#endif
Renato Cunha util.h: Utility macros for handling different Python APIs....	r11358
Siddharth Agarwal parsers: inline fields of dirstate values in C version...	r21809	typedef struct {
		PyObject_HEAD
		char state;
		int mode;
		int size;
		int mtime;
		} dirstateTupleObject;

André Sintzoff util.h: declare dirstateTupleType variable instead of defining it...	r21838	extern PyTypeObject dirstateTupleType;
Siddharth Agarwal parsers: inline fields of dirstate values in C version...	r21809	#define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateTupleType)

Siddharth Agarwal util.h: define an enum for normcase specs...	r24608	/* This should be kept in sync with normcasespecs in encoding.py. */
		enum normcase_spec {
		NORMCASE_LOWER = -1,
		NORMCASE_UPPER = 1,
		NORMCASE_OTHER = 0
		};

Laurent Charignon phase: compute phases in C...	r24443	#define MIN(a, b) (((a)<(b))?(a):(b))
Matt Mackall manifest: move C bool polyfill into util.h	r24442	/* VC9 doesn't include bool and lacks stdbool.h based on my searching */
Kevin Bullock util: fix the check for non-C99 compilers (issue4605)	r24829	#if defined(_MSC_VER) \|\| __STDC_VERSION__ < 199901L
Matt Mackall manifest: move C bool polyfill into util.h	r24442	#define true 1
		#define false 0
		typedef unsigned char bool;
		#else
		#include <stdbool.h>
		#endif

Renato Cunha util.h: Utility macros for handling different Python APIs....	r11358	#endif /* _HG_UTIL_H_ */