mirror of
https://github.com/git/git
synced 2024-08-27 03:29:21 +00:00
Merge branch 'ab/pack-linkage-fix'
"ld" on Solaris fails to link some test helpers, which has been worked around by reshuffling the inline function definitions from a header file to a source file that is the only user of them. * ab/pack-linkage-fix: pack-objects: move static inline from a header to the sole consumer
This commit is contained in:
commit
5afd72a96f
|
@ -37,6 +37,134 @@
|
||||||
#include "shallow.h"
|
#include "shallow.h"
|
||||||
#include "promisor-remote.h"
|
#include "promisor-remote.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Objects we are going to pack are collected in the `to_pack` structure.
|
||||||
|
* It contains an array (dynamically expanded) of the object data, and a map
|
||||||
|
* that can resolve SHA1s to their position in the array.
|
||||||
|
*/
|
||||||
|
static struct packing_data to_pack;
|
||||||
|
|
||||||
|
static inline struct object_entry *oe_delta(
|
||||||
|
const struct packing_data *pack,
|
||||||
|
const struct object_entry *e)
|
||||||
|
{
|
||||||
|
if (!e->delta_idx)
|
||||||
|
return NULL;
|
||||||
|
if (e->ext_base)
|
||||||
|
return &pack->ext_bases[e->delta_idx - 1];
|
||||||
|
else
|
||||||
|
return &pack->objects[e->delta_idx - 1];
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline unsigned long oe_delta_size(struct packing_data *pack,
|
||||||
|
const struct object_entry *e)
|
||||||
|
{
|
||||||
|
if (e->delta_size_valid)
|
||||||
|
return e->delta_size_;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* pack->delta_size[] can't be NULL because oe_set_delta_size()
|
||||||
|
* must have been called when a new delta is saved with
|
||||||
|
* oe_set_delta().
|
||||||
|
* If oe_delta() returns NULL (i.e. default state, which means
|
||||||
|
* delta_size_valid is also false), then the caller must never
|
||||||
|
* call oe_delta_size().
|
||||||
|
*/
|
||||||
|
return pack->delta_size[e - pack->objects];
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned long oe_get_size_slow(struct packing_data *pack,
|
||||||
|
const struct object_entry *e);
|
||||||
|
|
||||||
|
static inline unsigned long oe_size(struct packing_data *pack,
|
||||||
|
const struct object_entry *e)
|
||||||
|
{
|
||||||
|
if (e->size_valid)
|
||||||
|
return e->size_;
|
||||||
|
|
||||||
|
return oe_get_size_slow(pack, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void oe_set_delta(struct packing_data *pack,
|
||||||
|
struct object_entry *e,
|
||||||
|
struct object_entry *delta)
|
||||||
|
{
|
||||||
|
if (delta)
|
||||||
|
e->delta_idx = (delta - pack->objects) + 1;
|
||||||
|
else
|
||||||
|
e->delta_idx = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline struct object_entry *oe_delta_sibling(
|
||||||
|
const struct packing_data *pack,
|
||||||
|
const struct object_entry *e)
|
||||||
|
{
|
||||||
|
if (e->delta_sibling_idx)
|
||||||
|
return &pack->objects[e->delta_sibling_idx - 1];
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline struct object_entry *oe_delta_child(
|
||||||
|
const struct packing_data *pack,
|
||||||
|
const struct object_entry *e)
|
||||||
|
{
|
||||||
|
if (e->delta_child_idx)
|
||||||
|
return &pack->objects[e->delta_child_idx - 1];
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void oe_set_delta_child(struct packing_data *pack,
|
||||||
|
struct object_entry *e,
|
||||||
|
struct object_entry *delta)
|
||||||
|
{
|
||||||
|
if (delta)
|
||||||
|
e->delta_child_idx = (delta - pack->objects) + 1;
|
||||||
|
else
|
||||||
|
e->delta_child_idx = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void oe_set_delta_sibling(struct packing_data *pack,
|
||||||
|
struct object_entry *e,
|
||||||
|
struct object_entry *delta)
|
||||||
|
{
|
||||||
|
if (delta)
|
||||||
|
e->delta_sibling_idx = (delta - pack->objects) + 1;
|
||||||
|
else
|
||||||
|
e->delta_sibling_idx = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void oe_set_size(struct packing_data *pack,
|
||||||
|
struct object_entry *e,
|
||||||
|
unsigned long size)
|
||||||
|
{
|
||||||
|
if (size < pack->oe_size_limit) {
|
||||||
|
e->size_ = size;
|
||||||
|
e->size_valid = 1;
|
||||||
|
} else {
|
||||||
|
e->size_valid = 0;
|
||||||
|
if (oe_get_size_slow(pack, e) != size)
|
||||||
|
BUG("'size' is supposed to be the object size!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void oe_set_delta_size(struct packing_data *pack,
|
||||||
|
struct object_entry *e,
|
||||||
|
unsigned long size)
|
||||||
|
{
|
||||||
|
if (size < pack->oe_delta_size_limit) {
|
||||||
|
e->delta_size_ = size;
|
||||||
|
e->delta_size_valid = 1;
|
||||||
|
} else {
|
||||||
|
packing_data_lock(pack);
|
||||||
|
if (!pack->delta_size)
|
||||||
|
ALLOC_ARRAY(pack->delta_size, pack->nr_alloc);
|
||||||
|
packing_data_unlock(pack);
|
||||||
|
|
||||||
|
pack->delta_size[e - pack->objects] = size;
|
||||||
|
e->delta_size_valid = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#define IN_PACK(obj) oe_in_pack(&to_pack, obj)
|
#define IN_PACK(obj) oe_in_pack(&to_pack, obj)
|
||||||
#define SIZE(obj) oe_size(&to_pack, obj)
|
#define SIZE(obj) oe_size(&to_pack, obj)
|
||||||
#define SET_SIZE(obj,size) oe_set_size(&to_pack, obj, size)
|
#define SET_SIZE(obj,size) oe_set_size(&to_pack, obj, size)
|
||||||
|
@ -56,13 +184,6 @@ static const char *pack_usage[] = {
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
|
||||||
* Objects we are going to pack are collected in the `to_pack` structure.
|
|
||||||
* It contains an array (dynamically expanded) of the object data, and a map
|
|
||||||
* that can resolve SHA1s to their position in the array.
|
|
||||||
*/
|
|
||||||
static struct packing_data to_pack;
|
|
||||||
|
|
||||||
static struct pack_idx_entry **written_list;
|
static struct pack_idx_entry **written_list;
|
||||||
static uint32_t nr_result, nr_written, nr_seen;
|
static uint32_t nr_result, nr_written, nr_seen;
|
||||||
static struct bitmap_index *bitmap_git;
|
static struct bitmap_index *bitmap_git;
|
||||||
|
@ -301,6 +422,17 @@ static void copy_pack_data(struct hashfile *f,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline int oe_size_greater_than(struct packing_data *pack,
|
||||||
|
const struct object_entry *lhs,
|
||||||
|
unsigned long rhs)
|
||||||
|
{
|
||||||
|
if (lhs->size_valid)
|
||||||
|
return lhs->size_ > rhs;
|
||||||
|
if (rhs < pack->oe_size_limit) /* rhs < 2^x <= lhs ? */
|
||||||
|
return 1;
|
||||||
|
return oe_get_size_slow(pack, lhs) > rhs;
|
||||||
|
}
|
||||||
|
|
||||||
/* Return 0 if we will bust the pack-size limit */
|
/* Return 0 if we will bust the pack-size limit */
|
||||||
static unsigned long write_no_reuse_object(struct hashfile *f, struct object_entry *entry,
|
static unsigned long write_no_reuse_object(struct hashfile *f, struct object_entry *entry,
|
||||||
unsigned long limit, int usable_delta)
|
unsigned long limit, int usable_delta)
|
||||||
|
@ -642,6 +774,14 @@ static int mark_tagged(const char *path, const struct object_id *oid, int flag,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline unsigned char oe_layer(struct packing_data *pack,
|
||||||
|
struct object_entry *e)
|
||||||
|
{
|
||||||
|
if (!pack->layer)
|
||||||
|
return 0;
|
||||||
|
return pack->layer[e - pack->objects];
|
||||||
|
}
|
||||||
|
|
||||||
static inline void add_to_write_order(struct object_entry **wo,
|
static inline void add_to_write_order(struct object_entry **wo,
|
||||||
unsigned int *endp,
|
unsigned int *endp,
|
||||||
struct object_entry *e)
|
struct object_entry *e)
|
||||||
|
@ -2231,6 +2371,26 @@ static pthread_mutex_t progress_mutex;
|
||||||
* progress_mutex for protection.
|
* progress_mutex for protection.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
static inline int oe_size_less_than(struct packing_data *pack,
|
||||||
|
const struct object_entry *lhs,
|
||||||
|
unsigned long rhs)
|
||||||
|
{
|
||||||
|
if (lhs->size_valid)
|
||||||
|
return lhs->size_ < rhs;
|
||||||
|
if (rhs < pack->oe_size_limit) /* rhs < 2^x <= lhs ? */
|
||||||
|
return 0;
|
||||||
|
return oe_get_size_slow(pack, lhs) < rhs;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void oe_set_tree_depth(struct packing_data *pack,
|
||||||
|
struct object_entry *e,
|
||||||
|
unsigned int tree_depth)
|
||||||
|
{
|
||||||
|
if (!pack->tree_depth)
|
||||||
|
CALLOC_ARRAY(pack->tree_depth, pack->nr_alloc);
|
||||||
|
pack->tree_depth[e - pack->objects] = tree_depth;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Return the size of the object without doing any delta
|
* Return the size of the object without doing any delta
|
||||||
* reconstruction (so non-deltas are true object sizes, but deltas
|
* reconstruction (so non-deltas are true object sizes, but deltas
|
||||||
|
|
159
pack-objects.h
159
pack-objects.h
|
@ -268,152 +268,10 @@ static inline void oe_set_in_pack(struct packing_data *pack,
|
||||||
pack->in_pack[e - pack->objects] = p;
|
pack->in_pack[e - pack->objects] = p;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline struct object_entry *oe_delta(
|
|
||||||
const struct packing_data *pack,
|
|
||||||
const struct object_entry *e)
|
|
||||||
{
|
|
||||||
if (!e->delta_idx)
|
|
||||||
return NULL;
|
|
||||||
if (e->ext_base)
|
|
||||||
return &pack->ext_bases[e->delta_idx - 1];
|
|
||||||
else
|
|
||||||
return &pack->objects[e->delta_idx - 1];
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void oe_set_delta(struct packing_data *pack,
|
|
||||||
struct object_entry *e,
|
|
||||||
struct object_entry *delta)
|
|
||||||
{
|
|
||||||
if (delta)
|
|
||||||
e->delta_idx = (delta - pack->objects) + 1;
|
|
||||||
else
|
|
||||||
e->delta_idx = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void oe_set_delta_ext(struct packing_data *pack,
|
void oe_set_delta_ext(struct packing_data *pack,
|
||||||
struct object_entry *e,
|
struct object_entry *e,
|
||||||
const struct object_id *oid);
|
const struct object_id *oid);
|
||||||
|
|
||||||
static inline struct object_entry *oe_delta_child(
|
|
||||||
const struct packing_data *pack,
|
|
||||||
const struct object_entry *e)
|
|
||||||
{
|
|
||||||
if (e->delta_child_idx)
|
|
||||||
return &pack->objects[e->delta_child_idx - 1];
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void oe_set_delta_child(struct packing_data *pack,
|
|
||||||
struct object_entry *e,
|
|
||||||
struct object_entry *delta)
|
|
||||||
{
|
|
||||||
if (delta)
|
|
||||||
e->delta_child_idx = (delta - pack->objects) + 1;
|
|
||||||
else
|
|
||||||
e->delta_child_idx = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline struct object_entry *oe_delta_sibling(
|
|
||||||
const struct packing_data *pack,
|
|
||||||
const struct object_entry *e)
|
|
||||||
{
|
|
||||||
if (e->delta_sibling_idx)
|
|
||||||
return &pack->objects[e->delta_sibling_idx - 1];
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void oe_set_delta_sibling(struct packing_data *pack,
|
|
||||||
struct object_entry *e,
|
|
||||||
struct object_entry *delta)
|
|
||||||
{
|
|
||||||
if (delta)
|
|
||||||
e->delta_sibling_idx = (delta - pack->objects) + 1;
|
|
||||||
else
|
|
||||||
e->delta_sibling_idx = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned long oe_get_size_slow(struct packing_data *pack,
|
|
||||||
const struct object_entry *e);
|
|
||||||
static inline unsigned long oe_size(struct packing_data *pack,
|
|
||||||
const struct object_entry *e)
|
|
||||||
{
|
|
||||||
if (e->size_valid)
|
|
||||||
return e->size_;
|
|
||||||
|
|
||||||
return oe_get_size_slow(pack, e);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int oe_size_less_than(struct packing_data *pack,
|
|
||||||
const struct object_entry *lhs,
|
|
||||||
unsigned long rhs)
|
|
||||||
{
|
|
||||||
if (lhs->size_valid)
|
|
||||||
return lhs->size_ < rhs;
|
|
||||||
if (rhs < pack->oe_size_limit) /* rhs < 2^x <= lhs ? */
|
|
||||||
return 0;
|
|
||||||
return oe_get_size_slow(pack, lhs) < rhs;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int oe_size_greater_than(struct packing_data *pack,
|
|
||||||
const struct object_entry *lhs,
|
|
||||||
unsigned long rhs)
|
|
||||||
{
|
|
||||||
if (lhs->size_valid)
|
|
||||||
return lhs->size_ > rhs;
|
|
||||||
if (rhs < pack->oe_size_limit) /* rhs < 2^x <= lhs ? */
|
|
||||||
return 1;
|
|
||||||
return oe_get_size_slow(pack, lhs) > rhs;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void oe_set_size(struct packing_data *pack,
|
|
||||||
struct object_entry *e,
|
|
||||||
unsigned long size)
|
|
||||||
{
|
|
||||||
if (size < pack->oe_size_limit) {
|
|
||||||
e->size_ = size;
|
|
||||||
e->size_valid = 1;
|
|
||||||
} else {
|
|
||||||
e->size_valid = 0;
|
|
||||||
if (oe_get_size_slow(pack, e) != size)
|
|
||||||
BUG("'size' is supposed to be the object size!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline unsigned long oe_delta_size(struct packing_data *pack,
|
|
||||||
const struct object_entry *e)
|
|
||||||
{
|
|
||||||
if (e->delta_size_valid)
|
|
||||||
return e->delta_size_;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* pack->delta_size[] can't be NULL because oe_set_delta_size()
|
|
||||||
* must have been called when a new delta is saved with
|
|
||||||
* oe_set_delta().
|
|
||||||
* If oe_delta() returns NULL (i.e. default state, which means
|
|
||||||
* delta_size_valid is also false), then the caller must never
|
|
||||||
* call oe_delta_size().
|
|
||||||
*/
|
|
||||||
return pack->delta_size[e - pack->objects];
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void oe_set_delta_size(struct packing_data *pack,
|
|
||||||
struct object_entry *e,
|
|
||||||
unsigned long size)
|
|
||||||
{
|
|
||||||
if (size < pack->oe_delta_size_limit) {
|
|
||||||
e->delta_size_ = size;
|
|
||||||
e->delta_size_valid = 1;
|
|
||||||
} else {
|
|
||||||
packing_data_lock(pack);
|
|
||||||
if (!pack->delta_size)
|
|
||||||
ALLOC_ARRAY(pack->delta_size, pack->nr_alloc);
|
|
||||||
packing_data_unlock(pack);
|
|
||||||
|
|
||||||
pack->delta_size[e - pack->objects] = size;
|
|
||||||
e->delta_size_valid = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline unsigned int oe_tree_depth(struct packing_data *pack,
|
static inline unsigned int oe_tree_depth(struct packing_data *pack,
|
||||||
struct object_entry *e)
|
struct object_entry *e)
|
||||||
{
|
{
|
||||||
|
@ -422,23 +280,6 @@ static inline unsigned int oe_tree_depth(struct packing_data *pack,
|
||||||
return pack->tree_depth[e - pack->objects];
|
return pack->tree_depth[e - pack->objects];
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void oe_set_tree_depth(struct packing_data *pack,
|
|
||||||
struct object_entry *e,
|
|
||||||
unsigned int tree_depth)
|
|
||||||
{
|
|
||||||
if (!pack->tree_depth)
|
|
||||||
CALLOC_ARRAY(pack->tree_depth, pack->nr_alloc);
|
|
||||||
pack->tree_depth[e - pack->objects] = tree_depth;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline unsigned char oe_layer(struct packing_data *pack,
|
|
||||||
struct object_entry *e)
|
|
||||||
{
|
|
||||||
if (!pack->layer)
|
|
||||||
return 0;
|
|
||||||
return pack->layer[e - pack->objects];
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void oe_set_layer(struct packing_data *pack,
|
static inline void oe_set_layer(struct packing_data *pack,
|
||||||
struct object_entry *e,
|
struct object_entry *e,
|
||||||
unsigned char layer)
|
unsigned char layer)
|
||||||
|
|
Loading…
Reference in a new issue