1. 02 7月, 2016 1 次提交
    • J
      add an extra level of indirection to main() · 3f2e2297
      Jeff King 提交于
      There are certain startup tasks that we expect every git
      process to do. In some cases this is just to improve the
      quality of the program (e.g., setting up gettext()). In
      others it is a requirement for using certain functions in
      libgit.a (e.g., system_path() expects that you have called
      git_extract_argv0_path()).
      
      Most commands are builtins and are covered by the git.c
      version of main(). However, there are still a few external
      commands that use their own main(). Each of these has to
      remember to include the correct startup sequence, and we are
      not always consistent.
      
      Rather than just fix the inconsistencies, let's make this
      harder to get wrong by providing a common main() that can
      run this standard startup.
      
      We basically have two options to do this:
      
       - the compat/mingw.h file already does something like this by
         adding a #define that replaces the definition of main with a
         wrapper that calls mingw_startup().
      
         The upside is that the code in each program doesn't need
         to be changed at all; it's rewritten on the fly by the
         preprocessor.
      
         The downside is that it may make debugging of the startup
         sequence a bit more confusing, as the preprocessor is
         quietly inserting new code.
      
       - the builtin functions are all of the form cmd_foo(),
         and git.c's main() calls them.
      
         This is much more explicit, which may make things more
         obvious to somebody reading the code. It's also more
         flexible (because of course we have to figure out _which_
         cmd_foo() to call).
      
         The downside is that each of the builtins must define
         cmd_foo(), instead of just main().
      
      This patch chooses the latter option, preferring the more
      explicit approach, even though it is more invasive. We
      introduce a new file common-main.c, with the "real" main. It
      expects to call cmd_main() from whatever other objects it is
      linked against.
      
      We link common-main.o against anything that links against
      libgit.a, since we know that such programs will need to do
      this setup. Note that common-main.o can't actually go inside
      libgit.a, as the linker would not pick up its main()
      function automatically (it has no callers).
      
      The rest of the patch is just adjusting all of the various
      external programs (mostly in t/helper) to use cmd_main().
      I've provided a global declaration for cmd_main(), which
      means that all of the programs also need to match its
      signature. In particular, many functions need to switch to
      "const char **" instead of "char **" for argv. This effect
      ripples out to a few other variables and functions, as well.
      
      This makes the patch even more invasive, but the end result
      is much better. We should be treating argv strings as const
      anyway, and now all programs conform to the same signature
      (which also matches the way builtins are defined).
      Signed-off-by: NJeff King <peff@peff.net>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      3f2e2297
  2. 10 12月, 2014 1 次提交
    • J
      test-hashmap: squelch gcc compiler warning · 3b9a2b07
      Johannes Schindelin 提交于
      At least on this developer's MacOSX (Snow Leopard, gcc-4.2.1), GCC
      prints a warning that 'hash' may be used uninitialized when
      compiling test-hashmap that 'hash' may be used uninitialized (but
      GCC 4.6.3 on this developer's Ubuntu server does not report this
      problem).
      
      The old compiler is wrong, of course, as the switch (method & 3)
      statement already handles all the possible cases, but that does not
      help in a scenario where it is hard or impossible to upgrade to a
      newer compiler (e.g. being stuck on an older MacOSX and having to
      rely on Xcode).
      
      So let's just initialize the variable and be done with it, it is
      hardly a crucial part of the code because it is only used by the
      test suite and invisible to the end users.
      Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      3b9a2b07
  3. 08 7月, 2014 2 次提交
    • K
      hashmap: add string interning API · 7b64d42d
      Karsten Blees 提交于
      Interning short strings with high probability of duplicates can reduce the
      memory footprint and speed up comparisons.
      
      Add strintern() and memintern() APIs that use a hashmap to manage the pool
      of unique, interned strings.
      
      Note: strintern(getenv()) could be used to sanitize git's use of getenv(),
      in case we ever encounter a platform where a call to getenv() invalidates
      previous getenv() results (which is allowed by POSIX).
      Signed-off-by: NKarsten Blees <blees@dcon.de>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      7b64d42d
    • K
      hashmap: add simplified hashmap_get_from_hash() API · ab73a9d1
      Karsten Blees 提交于
      Hashmap entries are typically looked up by just a key. The hashmap_get()
      API expects an initialized entry structure instead, to support compound
      keys. This flexibility is currently only needed by find_dir_entry() in
      name-hash.c (and compat/win32/fscache.c in the msysgit fork). All other
      (currently five) call sites of hashmap_get() have to set up a near emtpy
      entry structure, resulting in duplicate code like this:
      
        struct hashmap_entry keyentry;
        hashmap_entry_init(&keyentry, hash(key));
        return hashmap_get(map, &keyentry, key);
      
      Add a hashmap_get_from_hash() API that allows hashmap lookups by just
      specifying the key and its hash code, i.e.:
      
        return hashmap_get_from_hash(map, hash(key), key);
      Signed-off-by: NKarsten Blees <blees@dcon.de>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      ab73a9d1
  4. 25 2月, 2014 1 次提交
  5. 19 11月, 2013 2 次提交
    • K
      remove old hash.[ch] implementation · efc68424
      Karsten Blees 提交于
      Signed-off-by: NKarsten Blees <blees@dcon.de>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      efc68424
    • K
      add a hashtable implementation that supports O(1) removal · 6a364ced
      Karsten Blees 提交于
      The existing hashtable implementation (in hash.[ch]) uses open addressing
      (i.e. resolve hash collisions by distributing entries across the table).
      Thus, removal is difficult to implement with less than O(n) complexity.
      Resolving collisions of entries with identical hashes (e.g. via chaining)
      is left to the client code.
      
      Add a hashtable implementation that supports O(1) removal and is slightly
      easier to use due to builtin entry chaining.
      
      Supports all basic operations init, free, get, add, remove and iteration.
      
      Also includes ready-to-use hash functions based on the public domain FNV-1
      algorithm (http://www.isthe.com/chongo/tech/comp/fnv).
      
      The per-entry data structure (hashmap_entry) is piggybacked in front of
      the client's data structure to save memory. See test-hashmap.c for usage
      examples.
      
      The hashtable is resized by a factor of four when 80% full. With these
      settings, average memory consumption is about 2/3 of hash.[ch], and
      insertion is about twice as fast due to less frequent resizing.
      
      Lookups are also slightly faster, because entries are strictly confined to
      their bucket (i.e. no data of other buckets needs to be traversed).
      Signed-off-by: NKarsten Blees <blees@dcon.de>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      6a364ced