2013-10-24 18:01:06 +00:00
|
|
|
#ifndef PACK_OBJECTS_H
|
|
|
|
|
#define PACK_OBJECTS_H
|
|
|
|
|
|
2018-04-14 15:35:05 +00:00
|
|
|
#include "object-store.h"
|
|
|
|
|
|
2018-04-15 15:36:17 +00:00
|
|
|
#define DEFAULT_DELTA_CACHE_SIZE (256 * 1024 * 1024)
|
|
|
|
|
|
2018-04-14 15:35:02 +00:00
|
|
|
#define OE_DFS_STATE_BITS 2
|
2018-04-14 15:35:03 +00:00
|
|
|
#define OE_DEPTH_BITS 12
|
2018-04-14 15:35:05 +00:00
|
|
|
#define OE_IN_PACK_BITS 10
|
2018-04-14 15:35:07 +00:00
|
|
|
#define OE_Z_DELTA_BITS 20
|
2018-04-14 15:35:10 +00:00
|
|
|
/*
|
|
|
|
|
* Note that oe_set_size() becomes expensive when the given size is
|
|
|
|
|
* above this limit. Don't lower it too much.
|
|
|
|
|
*/
|
|
|
|
|
#define OE_SIZE_BITS 31
|
2018-04-14 15:35:11 +00:00
|
|
|
#define OE_DELTA_SIZE_BITS 20
|
2018-04-14 15:35:02 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* State flags for depth-first search used for analyzing delta cycles.
|
|
|
|
|
*
|
|
|
|
|
* The depth is measured in delta-links to the base (so if A is a delta
|
|
|
|
|
* against B, then A has a depth of 1, and B a depth of 0).
|
|
|
|
|
*/
|
|
|
|
|
enum dfs_state {
|
|
|
|
|
DFS_NONE = 0,
|
|
|
|
|
DFS_ACTIVE,
|
|
|
|
|
DFS_DONE,
|
|
|
|
|
DFS_NUM_STATES
|
|
|
|
|
};
|
|
|
|
|
|
2018-04-14 15:35:00 +00:00
|
|
|
/*
|
2018-04-14 15:35:12 +00:00
|
|
|
* The size of struct nearly determines pack-objects's memory
|
|
|
|
|
* consumption. This struct is packed tight for that reason. When you
|
|
|
|
|
* add or reorder something in this struct, think a bit about this.
|
|
|
|
|
*
|
2018-04-14 15:35:00 +00:00
|
|
|
* basic object info
|
|
|
|
|
* -----------------
|
|
|
|
|
* idx.oid is filled up before delta searching starts. idx.crc32 is
|
|
|
|
|
* only valid after the object is written out and will be used for
|
|
|
|
|
* generating the index. idx.offset will be both gradually set and
|
|
|
|
|
* used in writing phase (base objects get offset first, then deltas
|
|
|
|
|
* refer to them)
|
|
|
|
|
*
|
|
|
|
|
* "size" is the uncompressed object size. Compressed size of the raw
|
|
|
|
|
* data for an object in a pack is not stored anywhere but is computed
|
2018-04-14 15:35:09 +00:00
|
|
|
* and made available when reverse .idx is made. Note that when a
|
|
|
|
|
* delta is reused, "size" is the uncompressed _delta_ size, not the
|
|
|
|
|
* canonical one after the delta has been applied.
|
2018-04-14 15:35:00 +00:00
|
|
|
*
|
|
|
|
|
* "hash" contains a path name hash which is used for sorting the
|
|
|
|
|
* delta list and also during delta searching. Once prepare_pack()
|
|
|
|
|
* returns it's no longer needed.
|
|
|
|
|
*
|
|
|
|
|
* source pack info
|
|
|
|
|
* ----------------
|
|
|
|
|
* The (in_pack, in_pack_offset) tuple contains the location of the
|
|
|
|
|
* object in the source pack. in_pack_header_size allows quickly
|
|
|
|
|
* skipping the header and going straight to the zlib stream.
|
|
|
|
|
*
|
|
|
|
|
* "type" and "in_pack_type" both describe object type. in_pack_type
|
|
|
|
|
* may contain a delta type, while type is always the canonical type.
|
|
|
|
|
*
|
|
|
|
|
* deltas
|
|
|
|
|
* ------
|
|
|
|
|
* Delta links (delta, delta_child and delta_sibling) are created to
|
|
|
|
|
* reflect that delta graph from the source pack then updated or added
|
|
|
|
|
* during delta searching phase when we find better deltas.
|
|
|
|
|
*
|
|
|
|
|
* delta_child and delta_sibling are last needed in
|
|
|
|
|
* compute_write_order(). "delta" and "delta_size" must remain valid
|
|
|
|
|
* at object writing phase in case the delta is not cached.
|
|
|
|
|
*
|
|
|
|
|
* If a delta is cached in memory and is compressed, delta_data points
|
|
|
|
|
* to the data and z_delta_size contains the compressed size. If it's
|
|
|
|
|
* uncompressed [1], z_delta_size must be zero. delta_size is always
|
|
|
|
|
* the uncompressed size and must be valid even if the delta is not
|
|
|
|
|
* cached.
|
|
|
|
|
*
|
|
|
|
|
* [1] during try_delta phase we don't bother with compressing because
|
|
|
|
|
* the delta could be quickly replaced with a better one.
|
|
|
|
|
*/
|
2013-10-24 18:01:06 +00:00
|
|
|
struct object_entry {
|
|
|
|
|
struct pack_idx_entry idx;
|
|
|
|
|
void *delta_data; /* cached delta (uncompressed) */
|
2018-04-14 15:35:12 +00:00
|
|
|
off_t in_pack_offset;
|
2013-10-24 18:01:06 +00:00
|
|
|
uint32_t hash; /* name hint hash */
|
2018-04-14 15:35:10 +00:00
|
|
|
unsigned size_:OE_SIZE_BITS;
|
|
|
|
|
unsigned size_valid:1;
|
2018-04-14 15:35:06 +00:00
|
|
|
uint32_t delta_idx; /* delta base object */
|
|
|
|
|
uint32_t delta_child_idx; /* deltified objects who bases me */
|
|
|
|
|
uint32_t delta_sibling_idx; /* other deltified objects who
|
|
|
|
|
* uses the same base as me
|
|
|
|
|
*/
|
2018-04-14 15:35:11 +00:00
|
|
|
unsigned delta_size_:OE_DELTA_SIZE_BITS; /* delta data size (uncompressed) */
|
|
|
|
|
unsigned delta_size_valid:1;
|
2018-04-14 15:35:12 +00:00
|
|
|
unsigned in_pack_idx:OE_IN_PACK_BITS; /* already in pack */
|
2018-04-14 15:35:07 +00:00
|
|
|
unsigned z_delta_size:OE_Z_DELTA_BITS;
|
2018-04-14 15:35:12 +00:00
|
|
|
unsigned type_valid:1;
|
2018-04-14 15:35:01 +00:00
|
|
|
unsigned type_:TYPE_BITS;
|
2018-04-14 15:35:12 +00:00
|
|
|
unsigned no_try_delta:1;
|
2018-04-14 15:35:01 +00:00
|
|
|
unsigned in_pack_type:TYPE_BITS; /* could be delta */
|
2013-10-24 18:01:06 +00:00
|
|
|
unsigned preferred_base:1; /*
|
|
|
|
|
* we do not pack this, but is available
|
|
|
|
|
* to be used as the base object to delta
|
|
|
|
|
* objects against.
|
|
|
|
|
*/
|
|
|
|
|
unsigned tagged:1; /* near the very tip of refs */
|
|
|
|
|
unsigned filled:1; /* assigned write-order */
|
2018-04-14 15:35:02 +00:00
|
|
|
unsigned dfs_state:OE_DFS_STATE_BITS;
|
2018-04-14 15:35:12 +00:00
|
|
|
unsigned char in_pack_header_size;
|
2018-04-14 15:35:03 +00:00
|
|
|
unsigned depth:OE_DEPTH_BITS;
|
pack-objects: break delta cycles before delta-search phase
We do not allow cycles in the delta graph of a pack (i.e., A
is a delta of B which is a delta of A) for the obvious
reason that you cannot actually access any of the objects in
such a case.
There's a last-ditch attempt to notice cycles during the
write phase, during which we issue a warning to the user and
write one of the objects out in full. However, this is
"last-ditch" for two reasons:
1. By this time, it's too late to find another delta for
the object, so the resulting pack is larger than it
otherwise could be.
2. The warning is there because this is something that
_shouldn't_ ever happen. If it does, then either:
a. a pack we are reusing deltas from had its own
cycle
b. we are reusing deltas from multiple packs, and
we found a cycle among them (i.e., A is a delta of
B in one pack, but B is a delta of A in another,
and we choose to use both deltas).
c. there is a bug in the delta-search code
So this code serves as a final check that none of these
things has happened, warns the user, and prevents us
from writing a bogus pack.
Right now, (2b) should never happen because of the static
ordering of packs in want_object_in_pack(). If two objects
have a delta relationship, then they must be in the same
pack, and therefore we will find them from that same pack.
However, a future patch would like to change that static
ordering, which will make (2b) a common occurrence. In
preparation, we should be able to handle those kinds of
cycles better. This patch does by introducing a
cycle-breaking step during the get_object_details() phase,
when we are deciding which deltas can be reused. That gives
us the chance to feed the objects into the delta search as
if the cycle did not exist.
We'll leave the detection and warning in the write_object()
phase in place, as it still serves as a check for case (2c).
This does mean we will stop warning for (2a). That case is
caused by bogus input packs, and we ideally would warn the
user about it. However, since those cycles show up after
picking reusable deltas, they look the same as (2b) to us;
our new code will break the cycles early and the last-ditch
check will never see them.
We could do analysis on any cycles that we find to
distinguish the two cases (i.e., it is a bogus pack if and
only if every delta in the cycle is in the same pack), but
we don't need to. If there is a cycle inside a pack, we'll
run into problems not only reusing the delta, but accessing
the object data at all. So when we try to dig up the actual
size of the object, we'll hit that same cycle and kick in
our usual complain-and-try-another-source code.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-11 09:26:36 +00:00
|
|
|
|
|
|
|
|
/*
|
2018-04-14 15:35:12 +00:00
|
|
|
* pahole results on 64-bit linux (gcc and clang)
|
pack-objects: enforce --depth limit in reused deltas
Since 898b14c (pack-objects: rework check_delta_limit usage,
2007-04-16), we check the delta depth limit only when
figuring out whether we should make a new delta. We don't
consider it at all when reusing deltas, which means that
packing once with --depth=250, and then again with
--depth=50, the second pack may still contain chains larger
than 50.
This is generally considered a feature, as the results of
earlier high-depth repacks are carried forward, used for
serving fetches, etc. However, since we started using
cross-pack deltas in c9af708b1 (pack-objects: use mru list
when iterating over packs, 2016-08-11), we are no longer
bounded by the length of an existing delta chain in a single
pack.
Here's one particular pathological case: a sequence of N
packs, each with 2 objects, the base of which is stored as a
delta in a previous pack. If we chain all the deltas
together, we have a cycle of length N. We break the cycle,
but the tip delta is still at depth N-1.
This is less unlikely than it might sound. See the included
test for a reconstruction based on real-world actions. I
ran into such a case in the wild, where a client was rapidly
sending packs, and we had accumulated 10,000 before doing a
server-side repack. The pack that "git repack" tried to
generate had a very deep chain, which caused pack-objects to
run out of stack space in the recursive write_one().
This patch bounds the length of delta chains in the output
pack based on --depth, regardless of whether they are caused
by cross-pack deltas or existed in the input packs. This
fixes the problem, but does have two possible downsides:
1. High-depth aggressive repacks followed by "normal"
repacks will throw away the high-depth chains.
In the long run this is probably OK; investigation
showed that high-depth repacks aren't actually
beneficial, and we dropped the aggressive depth default
to match the normal case in 07e7dbf0d (gc: default
aggressive depth to 50, 2016-08-11).
2. If you really do want to store high-depth deltas on
disk, they may be discarded and new delta computed when
serving a fetch, unless you set pack.depth to match
your high-depth size.
The implementation uses the existing search for delta
cycles. That lets us compute the depth of any node based on
the depth of its base, because we know the base is DFS_DONE
by the time we look at it (modulo any cycles in the graph,
but we know there cannot be any because we break them as we
see them).
There is some subtlety worth mentioning, though. We record
the depth of each object as we compute it. It might seem
like we could save the per-object storage space by just
keeping track of the depth of our traversal (i.e., have
break_delta_chains() report how deep it went). But we may
visit an object through multiple delta paths, and on
subsequent paths we want to know its depth immediately,
without having to walk back down to its final base (doing so
would make our graph walk quadratic rather than linear).
Likewise, one could try to record the depth not from the
base, but from our starting point (i.e., start
recursion_depth at 0, and pass "recursion_depth + 1" to each
invocation of break_delta_chains()). And then when
recursion_depth gets too big, we know that we must cut the
delta chain. But that technique is wrong if we do not visit
the nodes in topological order. In a chain A->B->C, it
if we visit "C", then "B", then "A", we will never recurse
deeper than 1 link (because we see at each node that we have
already visited it).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-01-28 00:09:59 +00:00
|
|
|
*
|
2018-04-14 15:35:12 +00:00
|
|
|
* size: 80, bit_padding: 20 bits, holes: 8 bits
|
|
|
|
|
*
|
|
|
|
|
* and on 32-bit (gcc)
|
|
|
|
|
*
|
|
|
|
|
* size: 76, bit_padding: 20 bits, holes: 8 bits
|
pack-objects: break delta cycles before delta-search phase
We do not allow cycles in the delta graph of a pack (i.e., A
is a delta of B which is a delta of A) for the obvious
reason that you cannot actually access any of the objects in
such a case.
There's a last-ditch attempt to notice cycles during the
write phase, during which we issue a warning to the user and
write one of the objects out in full. However, this is
"last-ditch" for two reasons:
1. By this time, it's too late to find another delta for
the object, so the resulting pack is larger than it
otherwise could be.
2. The warning is there because this is something that
_shouldn't_ ever happen. If it does, then either:
a. a pack we are reusing deltas from had its own
cycle
b. we are reusing deltas from multiple packs, and
we found a cycle among them (i.e., A is a delta of
B in one pack, but B is a delta of A in another,
and we choose to use both deltas).
c. there is a bug in the delta-search code
So this code serves as a final check that none of these
things has happened, warns the user, and prevents us
from writing a bogus pack.
Right now, (2b) should never happen because of the static
ordering of packs in want_object_in_pack(). If two objects
have a delta relationship, then they must be in the same
pack, and therefore we will find them from that same pack.
However, a future patch would like to change that static
ordering, which will make (2b) a common occurrence. In
preparation, we should be able to handle those kinds of
cycles better. This patch does by introducing a
cycle-breaking step during the get_object_details() phase,
when we are deciding which deltas can be reused. That gives
us the chance to feed the objects into the delta search as
if the cycle did not exist.
We'll leave the detection and warning in the write_object()
phase in place, as it still serves as a check for case (2c).
This does mean we will stop warning for (2a). That case is
caused by bogus input packs, and we ideally would warn the
user about it. However, since those cycles show up after
picking reusable deltas, they look the same as (2b) to us;
our new code will break the cycles early and the last-ditch
check will never see them.
We could do analysis on any cycles that we find to
distinguish the two cases (i.e., it is a bogus pack if and
only if every delta in the cycle is in the same pack), but
we don't need to. If there is a cycle inside a pack, we'll
run into problems not only reusing the delta, but accessing
the object data at all. So when we try to dig up the actual
size of the object, we'll hit that same cycle and kick in
our usual complain-and-try-another-source code.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-11 09:26:36 +00:00
|
|
|
*/
|
2013-10-24 18:01:06 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct packing_data {
|
|
|
|
|
struct object_entry *objects;
|
|
|
|
|
uint32_t nr_objects, nr_alloc;
|
|
|
|
|
|
|
|
|
|
int32_t *index;
|
|
|
|
|
uint32_t index_size;
|
2018-04-14 15:35:04 +00:00
|
|
|
|
|
|
|
|
unsigned int *in_pack_pos;
|
2018-04-14 15:35:05 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Only one of these can be non-NULL and they have different
|
|
|
|
|
* sizes. if in_pack_by_idx is allocated, oe_in_pack() returns
|
|
|
|
|
* the pack of an object using in_pack_idx field. If not,
|
|
|
|
|
* in_pack[] array is used the same way as in_pack_pos[]
|
|
|
|
|
*/
|
|
|
|
|
struct packed_git **in_pack_by_idx;
|
|
|
|
|
struct packed_git **in_pack;
|
2018-04-14 15:35:10 +00:00
|
|
|
|
|
|
|
|
uintmax_t oe_size_limit;
|
2013-10-24 18:01:06 +00:00
|
|
|
};
|
|
|
|
|
|
2018-04-14 15:35:05 +00:00
|
|
|
void prepare_packing_data(struct packing_data *pdata);
|
2013-10-24 18:01:06 +00:00
|
|
|
struct object_entry *packlist_alloc(struct packing_data *pdata,
|
|
|
|
|
const unsigned char *sha1,
|
|
|
|
|
uint32_t index_pos);
|
|
|
|
|
|
|
|
|
|
struct object_entry *packlist_find(struct packing_data *pdata,
|
|
|
|
|
const unsigned char *sha1,
|
|
|
|
|
uint32_t *index_pos);
|
|
|
|
|
|
2013-10-24 18:01:29 +00:00
|
|
|
static inline uint32_t pack_name_hash(const char *name)
|
|
|
|
|
{
|
|
|
|
|
uint32_t c, hash = 0;
|
|
|
|
|
|
|
|
|
|
if (!name)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This effectively just creates a sortable number from the
|
|
|
|
|
* last sixteen non-whitespace characters. Last characters
|
|
|
|
|
* count "most", so things that end in ".c" sort together.
|
|
|
|
|
*/
|
|
|
|
|
while ((c = *name++) != 0) {
|
|
|
|
|
if (isspace(c))
|
|
|
|
|
continue;
|
|
|
|
|
hash = (hash >> 2) + (c << 24);
|
|
|
|
|
}
|
|
|
|
|
return hash;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-14 15:35:01 +00:00
|
|
|
static inline enum object_type oe_type(const struct object_entry *e)
|
|
|
|
|
{
|
|
|
|
|
return e->type_valid ? e->type_ : OBJ_BAD;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void oe_set_type(struct object_entry *e,
|
|
|
|
|
enum object_type type)
|
|
|
|
|
{
|
|
|
|
|
if (type >= OBJ_ANY)
|
|
|
|
|
BUG("OBJ_ANY cannot be set in pack-objects code");
|
|
|
|
|
|
|
|
|
|
e->type_valid = type >= OBJ_NONE;
|
|
|
|
|
e->type_ = (unsigned)type;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-14 15:35:04 +00:00
|
|
|
static inline unsigned int oe_in_pack_pos(const struct packing_data *pack,
|
|
|
|
|
const struct object_entry *e)
|
|
|
|
|
{
|
|
|
|
|
return pack->in_pack_pos[e - pack->objects];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void oe_set_in_pack_pos(const struct packing_data *pack,
|
|
|
|
|
const struct object_entry *e,
|
|
|
|
|
unsigned int pos)
|
|
|
|
|
{
|
|
|
|
|
pack->in_pack_pos[e - pack->objects] = pos;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-14 15:35:05 +00:00
|
|
|
static inline struct packed_git *oe_in_pack(const struct packing_data *pack,
|
|
|
|
|
const struct object_entry *e)
|
|
|
|
|
{
|
|
|
|
|
if (pack->in_pack_by_idx)
|
|
|
|
|
return pack->in_pack_by_idx[e->in_pack_idx];
|
|
|
|
|
else
|
|
|
|
|
return pack->in_pack[e - pack->objects];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void oe_map_new_pack(struct packing_data *pack,
|
|
|
|
|
struct packed_git *p);
|
|
|
|
|
static inline void oe_set_in_pack(struct packing_data *pack,
|
|
|
|
|
struct object_entry *e,
|
|
|
|
|
struct packed_git *p)
|
|
|
|
|
{
|
|
|
|
|
if (!p->index)
|
|
|
|
|
oe_map_new_pack(pack, p);
|
|
|
|
|
if (pack->in_pack_by_idx)
|
|
|
|
|
e->in_pack_idx = p->index;
|
|
|
|
|
else
|
|
|
|
|
pack->in_pack[e - pack->objects] = p;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-14 15:35:06 +00:00
|
|
|
static inline struct object_entry *oe_delta(
|
|
|
|
|
const struct packing_data *pack,
|
|
|
|
|
const struct object_entry *e)
|
|
|
|
|
{
|
|
|
|
|
if (e->delta_idx)
|
|
|
|
|
return &pack->objects[e->delta_idx - 1];
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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_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;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-14 15:35:10 +00:00
|
|
|
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!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-14 15:35:11 +00:00
|
|
|
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_;
|
|
|
|
|
return oe_size(pack, e);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void oe_set_delta_size(struct packing_data *pack,
|
|
|
|
|
struct object_entry *e,
|
|
|
|
|
unsigned long size)
|
|
|
|
|
{
|
|
|
|
|
e->delta_size_ = size;
|
|
|
|
|
e->delta_size_valid = e->delta_size_ == size;
|
|
|
|
|
if (!e->delta_size_valid && size != oe_size(pack, e))
|
|
|
|
|
BUG("this can only happen in check_object() "
|
|
|
|
|
"where delta size is the same as entry size");
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-24 18:01:06 +00:00
|
|
|
#endif
|