Merge branch 'ot/mru-on-list'

The first step to getting rid of mru API and using the
doubly-linked list API directly instead.

* ot/mru-on-list:
  mru: use double-linked list from list.h
This commit is contained in:
Junio C Hamano
2018-02-13 13:39:05 -08:00
4 changed files with 33 additions and 59 deletions

View File

@ -45,7 +45,7 @@ static unsigned int pack_max_fds;
static size_t peak_pack_mapped;
static size_t pack_mapped;
struct packed_git *packed_git;
struct mru packed_git_mru;
struct mru packed_git_mru = {{&packed_git_mru.list, &packed_git_mru.list}};
#define SZ_FMT PRIuMAX
static inline uintmax_t sz_fmt(size_t s) { return s; }
@ -1841,13 +1841,14 @@ static int fill_pack_entry(const unsigned char *sha1,
*/
int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
{
struct mru_entry *p;
struct list_head *pos;
prepare_packed_git();
if (!packed_git)
return 0;
for (p = packed_git_mru.head; p; p = p->next) {
list_for_each(pos, &packed_git_mru.list) {
struct mru *p = list_entry(pos, struct mru, list);
if (fill_pack_entry(sha1, e, p->item)) {
mru_mark(&packed_git_mru, p);
return 1;