* of the GNU Lesser General Public License.
*/
+#include "lib/stkstring.h"
+
typedef struct {
P(key) *key;
// FIXME: Add the hash here to save cache misses
#define ASORT_EXTRA_ARGS , P(internal_item_t) *ary
#include "lib/arraysort.h"
+/*
+ * The big_buf has the following layout:
+ *
+ * +-------------------------------------------------------------------------------+
+ * | array of internal_item's |
+ * +-------------------------------------------------------------------------------+
+ * | padding to make the following part page-aligned |
+ * +--------------------------------+----------------------------------------------+
+ * | shadow copy of item array | array of pointers to data for write_merged() |
+ * | used if radix-sorting +----------------------------------------------+
+ * | | workspace for write_merged() |
+ * +--------------------------------+----------------------------------------------+
+ * | +---------+ |
+ * | | key | |
+ * | +---------+ |
+ * | sequence of | padding | |
+ * | items +---------+ |
+ * | | data | |
+ * | +---------+ |
+ * | | padding | |
+ * | +---------+ |
+ * +-------------------------------------------------------------------------------+
+ *
+ * (the data which are in different columns are never accessed simultaneously,
+ * so we use a single buffer for both)
+ */
+
static inline void *P(internal_get_data)(P(key) *key)
{
uns ksize = SORT_KEY_SIZE(*key);
return (byte *) key + ksize;
}
+static inline size_t P(internal_workspace)(P(key) *key UNUSED)
+{
+ size_t ws = 0;
+#ifdef SORT_UNIFY
+ ws += sizeof(void *);
+#endif
+#ifdef SORT_UNIFY_WORKSPACE
+ ws += SORT_UNIFY_WORKSPACE(*key);
+#endif
+#if 0 /* FIXME: Shadow copy if radix-sorting */
+ ws = MAX(ws, sizeof(P(key) *));
+#endif
+ return ws;
+}
+
static int P(internal)(struct sort_context *ctx, struct sort_bucket *bin, struct sort_bucket *bout, struct sort_bucket *bout_only)
{
sorter_alloc_buf(ctx);
else if (!P(read_key)(in, &key))
return 0;
+ size_t bufsize = ctx->big_buf_size;
#ifdef SORT_VAR_DATA
- if (sizeof(key) + 1024 + SORT_DATA_SIZE(key) > ctx->big_buf_half_size)
+ if (sizeof(key) + 2*CPU_PAGE_SIZE + SORT_DATA_SIZE(key) + P(internal_workspace)(&key) > bufsize)
{
SORT_XTRACE(3, "s-internal: Generating a giant run");
- struct fastbuf *out = sbuck_write(bout); /* FIXME: Using a non-direct buffer would be nice here */
+ struct fastbuf *out = sbuck_write(bout);
P(copy_data)(&key, in, out);
bout->runs++;
return 1; // We don't know, but 1 is always safe
}
#endif
- size_t bufsize = ctx->big_buf_half_size; /* FIXME: In some cases, we can use the whole buffer */
-#ifdef CPU_64BIT_POINTERS
- bufsize = MIN((u64)bufsize, (u64)~0U * sizeof(P(internal_item_t))); // The number of records must fit in uns
-#endif
-
- SORT_XTRACE(3, "s-internal: Reading (bufsize=%zd)", bufsize);
+ SORT_XTRACE(4, "s-internal: Reading");
P(internal_item_t) *item_array = ctx->big_buf, *item = item_array, *last_item;
byte *end = (byte *) ctx->big_buf + bufsize;
+ size_t remains = bufsize - CPU_PAGE_SIZE;
do
{
uns ksize = SORT_KEY_SIZE(key);
#endif
uns dsize = SORT_DATA_SIZE(key);
uns recsize = ALIGN_TO(ksize_aligned + dsize, CPU_STRUCT_ALIGN);
- if (unlikely(sizeof(P(internal_item_t)) + recsize > (size_t)(end - (byte *) item)))
+ size_t totalsize = recsize + sizeof(P(internal_item_t) *) + P(internal_workspace)(&key);
+ if (unlikely(totalsize > remains
+#ifdef CPU_64BIT_POINTERS
+ || item >= item_array + ~0U // The number of items must fit in an uns
+#endif
+ ))
{
ctx->more_keys = 1;
*keybuf = key;
break;
}
+ remains -= totalsize;
end -= recsize;
memcpy(end, &key, ksize);
#ifdef SORT_VAR_DATA
last_item = item;
uns count = last_item - item_array;
- SORT_XTRACE(3, "s-internal: Sorting %u items", count);
+ void *workspace UNUSED = ALIGN_PTR(last_item, CPU_PAGE_SIZE);
+ SORT_XTRACE(3, "s-internal: Read %u items (%s items, %s workspace, %s data)",
+ count,
+ stk_fsize((byte*)last_item - (byte*)item_array),
+ stk_fsize(end - (byte*)last_item - remains),
+ stk_fsize((byte*)ctx->big_buf + bufsize - end));
+ timestamp_t timer;
+ init_timer(&timer);
P(array_sort)(count, item_array);
+ ctx->total_int_time += get_timer(&timer);
- SORT_XTRACE(3, "s-internal: Writing");
+ SORT_XTRACE(4, "s-internal: Writing");
if (!ctx->more_keys)
bout = bout_only;
struct fastbuf *out = sbuck_write(bout);
if (item < last_item - 1 && !P(compare)(item->key, item[1].key))
{
// Rewrite the item structures with just pointers to keys and place
- // pointers to data in the secondary array.
+ // pointers to data in the workspace.
P(key) **key_array = (void *) item;
- void **data_array = (void **) ctx->big_buf_half;
+ void **data_array = workspace;
key_array[0] = item[0].key;
data_array[0] = P(internal_get_data)(key_array[0]);
uns cnt;
static u64
P(internal_estimate)(struct sort_context *ctx, struct sort_bucket *b UNUSED)
{
- uns avg;
#ifdef SORT_VAR_KEY
- avg = ALIGN_TO(sizeof(P(key))/4, CPU_STRUCT_ALIGN); // Wild guess...
+ uns avg = ALIGN_TO(sizeof(P(key))/4, CPU_STRUCT_ALIGN); // Wild guess...
#else
- avg = ALIGN_TO(sizeof(P(key)), CPU_STRUCT_ALIGN);
+ uns avg = ALIGN_TO(sizeof(P(key)), CPU_STRUCT_ALIGN);
#endif
// We ignore the data part of records, it probably won't make the estimate much worse
- return (ctx->big_buf_half_size / (avg + sizeof(P(internal_item_t))) * avg);
+ size_t bufsize = ctx->big_buf_size;
+#ifdef SORT_UNIFY_WORKSPACE // FIXME: Or if radix-sorting
+ bufsize /= 2;
+#endif
+ return (bufsize / (avg + sizeof(P(internal_item_t))) * avg);
}
projects / libucw.git / blobdiff