bclose(in1);
bclose(in2);
if (sorter_trace)
- log(L_INFO, "Pass %d: %d runs, %d+%d KB", sorter_pass_counter, run_count,
+ msg(L_INFO, "Pass %d: %d runs, %d+%d KB", sorter_pass_counter, run_count,
(out1 ? (int)((btell(out1) + 1023) / 1024) : 0),
(out2 ? (int)((btell(out2) + 1023) / 1024) : 0));
*fb1 = P(flush_out)(out1);
bclose(in);
if (sorter_trace)
- log(L_INFO, "Pass 0: %d runs, %d+%d KB",
+ msg(L_INFO, "Pass 0: %d runs, %d+%d KB",
run_count,
(out1 ? (int)((btell(out1) + 1023) / 1024) : 0),
(out2 ? (int)((btell(out2) + 1023) / 1024) : 0));
}
for(;;)
{
- current = (byte *) ALIGN_TO((addr_int_t) current, CPU_STRUCT_ALIGN);
+ current = (byte *) ALIGN_TO((uintptr_t) current, CPU_STRUCT_ALIGN);
if (current + sizeof(*this) > bufend)
break;
this = (SORT_NODE *) current;
bclose(in);
if (sorter_trace)
- log(L_INFO, "Pass 0: %d runs (%d giants, %d splits), %d+%d KB",
+ msg(L_INFO, "Pass 0: %d runs (%d giants, %d splits), %d+%d KB",
run_count, giant_count, split_count,
(out1 ? (int)((btell(out1) + 1023) / 1024) : 0),
(out2 ? (int)((btell(out2) + 1023) / 1024) : 0));
#ifdef SORT_OUTPUT_FB
return fb1;
#else
- bconfig(fb1, BCONFIG_IS_TEMP_FILE, 0);
- if (rename(fb1->name, outname) < 0)
- die("rename(%s,%s): %m", fb1->name, outname);
- bclose(fb1);
+ bfix_tmp_file(fb1, outname);
#endif
}