Page MenuHomeFreeBSD
Differential D38134

databases/mongodb50: use in-source boost
ClosedPublic
Actions

Authored by ronald_klop.ws on Jan 20 2023, 10:05 AM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 20 2025, 1:30 AM
Unknown Object (File)
Jan 18 2025, 12:50 AM
Unknown Object (File)
Dec 18 2024, 10:41 PM
Unknown Object (File)
Nov 23 2024, 4:05 AM
Unknown Object (File)
Nov 22 2024, 11:55 PM
Unknown Object (File)
Oct 21 2024, 3:18 PM
Unknown Object (File)
Oct 21 2024, 3:18 PM
Unknown Object (File)
Oct 21 2024, 3:18 PM
View All 83 Files
Subscribers
mat

Details

Reviewers
pkubaj
rene
Commits
R11:d04cd83954fa: databases/mongodb50: use in-source boost
Summary

Does not compile with new boost 1.81.0 from ports.

PR: 269024

Test Plan

poudriere stage-qa: ok

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

ronald_klop.ws created this revision.Jan 20 2023, 10:05 AM
Herald added a subscriber: mat. · View Herald TranscriptJan 20 2023, 10:05 AM
ronald_klop.ws requested review of this revision.Jan 20 2023, 10:05 AM
Harbormaster completed remote builds in B49179: Diff 115349.Jan 20 2023, 10:05 AM
rene added a comment.Jan 20 2023, 12:17 PM

Otherwise this is fine.

databases/mongodb50/distinfo
1 ↗(On Diff #115349)

Why bump the timestamp? Spurious make makesum ?

ronald_klop.ws marked an inline comment as done.Jan 20 2023, 12:51 PM
ronald_klop.ws added inline comments.
databases/mongodb50/distinfo
1 ↗(On Diff #115349)

Why bump the timestamp? Spurious make makesum ?

Ah I tried an upgrade to 5.0.15-rc0 and last minute decided to stay at 5.0.14 and ran makesum instead of git restore.
I will revert the distinfo change.

rene accepted this revision.Jan 20 2023, 12:53 PM
This revision is now accepted and ready to land.Jan 20 2023, 12:53 PM
ronald_klop.ws updated this revision to Diff 115353.Jan 20 2023, 1:06 PM
ronald_klop.ws marked an inline comment as done.

new version without a change in distinfo
NB: probably a PORTREVISION bump was not necessary either because it doesn't build anyway. But it will not harm anything either. So better be sure.

This revision now requires review to proceed.Jan 20 2023, 1:06 PM
Harbormaster completed remote builds in B49180: Diff 115353.Jan 20 2023, 1:06 PM
This revision was not accepted when it landed; it landed in state Needs Review.Jan 20 2023, 2:07 PM
Closed by commit R11:d04cd83954fa: databases/mongodb50: use in-source boost (authored by ronald_klop.ws). · Explain Why
This revision was automatically updated to reflect the committed changes.
ronald_klop.ws added a commit: R11:d04cd83954fa: databases/mongodb50: use in-source boost.

Revision Contents
Changeset List

PathSize
databases/
mongodb50/
7 lines
files/

Diff 115354

View Options

databases/mongodb50/Makefile

Show First 20 Lines • Show All 289 Lines • ▼ Show 20 Lines
} }
/* /*
* blist_alloc() - reserve space in the block bitmap. Return the base * blist_alloc() - reserve space in the block bitmap. Return the base
* of a contiguous region or SWAPBLK_NONE if space could * of a contiguous region or SWAPBLK_NONE if space could
* not be allocated. * not be allocated.
*/ */
daddr_t daddr_t
blist_alloc(blist_t bl, int *count, int maxcount) blist_alloc(blist_t bl, daddr_t *io_cursor, int *count, int maxcount)
{ {
daddr_t blk, cursor; daddr_t blk, cursor;
KASSERT(*count <= maxcount, KASSERT(*count <= maxcount,
("invalid parameters %d > %d", *count, maxcount)); ("invalid parameters %d > %d", *count, maxcount));
KASSERT(*count <= BLIST_MAX_ALLOC, KASSERT(*count <= BLIST_MAX_ALLOC,
("minimum allocation too large: %d", *count)); ("minimum allocation too large: %d", *count));
/* /*
* This loop iterates at most twice. An allocation failure in the * This loop iterates at most twice. An allocation failure in the
* first iteration leads to a second iteration only if the cursor was * first iteration leads to a second iteration only if the cursor was
* non-zero. When the cursor is zero, an allocation failure will * non-zero. When the cursor is zero, an allocation failure will
* stop further iterations. * stop further iterations.
*/ */
for (cursor = bl->bl_cursor;; cursor = 0) { for (cursor = *io_cursor;; cursor = 0) {
blk = blst_meta_alloc(bl->bl_root, cursor, count, maxcount, blk = blst_meta_alloc(bl->bl_root, cursor, count, maxcount,
bl->bl_radix); bl->bl_radix);
if (blk != SWAPBLK_NONE) { if (blk != SWAPBLK_NONE) {
bl->bl_avail -= *count; bl->bl_avail -= *count;
bl->bl_cursor = blk + *count; *io_cursor = blk + *count;
if (bl->bl_cursor == bl->bl_blocks) if (*io_cursor == bl->bl_blocks)
bl->bl_cursor = 0; *io_cursor = 0;
return (blk); return (blk);
} }
if (cursor == 0) if (cursor == 0)
return (SWAPBLK_NONE); return (SWAPBLK_NONE);
} }
} }
/* /*
▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Lines
#ifdef BLIST_DEBUG #ifdef BLIST_DEBUG
/* /*
* blist_print() - dump radix tree * blist_print() - dump radix tree
*/ */
void void
blist_print(blist_t bl) blist_print(blist_t bl)
{ {
printf("BLIST avail = %jd, cursor = %08jx {\n", printf("BLIST avail = %jd {\n", (uintmax_t)bl->bl_avail);
(uintmax_t)bl->bl_avail, (uintmax_t)bl->bl_cursor);
if (bl->bl_root->bm_bitmap != 0) if (bl->bl_root->bm_bitmap != 0)
blst_radix_print(bl->bl_root, 0, bl->bl_radix, 4); blst_radix_print(bl->bl_root, 0, bl->bl_radix, 4);
printf("}\n"); printf("}\n");
} }
#endif #endif
▲ Show 20 Lines • Show All 801 Lines • Show Last 20 Lines
View Options

databases/mongodb50/files/patch-boost-179-compat

Show First 20 Lines • Show All 289 Lines • ▼ Show 20 Lines
} }
/* /*
* blist_alloc() - reserve space in the block bitmap. Return the base * blist_alloc() - reserve space in the block bitmap. Return the base
* of a contiguous region or SWAPBLK_NONE if space could * of a contiguous region or SWAPBLK_NONE if space could
* not be allocated. * not be allocated.
*/ */
daddr_t daddr_t
blist_alloc(blist_t bl, int *count, int maxcount) blist_alloc(blist_t bl, daddr_t *io_cursor, int *count, int maxcount)
{ {
daddr_t blk, cursor; daddr_t blk, cursor;
KASSERT(*count <= maxcount, KASSERT(*count <= maxcount,
("invalid parameters %d > %d", *count, maxcount)); ("invalid parameters %d > %d", *count, maxcount));
KASSERT(*count <= BLIST_MAX_ALLOC, KASSERT(*count <= BLIST_MAX_ALLOC,
("minimum allocation too large: %d", *count)); ("minimum allocation too large: %d", *count));
/* /*
* This loop iterates at most twice. An allocation failure in the * This loop iterates at most twice. An allocation failure in the
* first iteration leads to a second iteration only if the cursor was * first iteration leads to a second iteration only if the cursor was
* non-zero. When the cursor is zero, an allocation failure will * non-zero. When the cursor is zero, an allocation failure will
* stop further iterations. * stop further iterations.
*/ */
for (cursor = bl->bl_cursor;; cursor = 0) { for (cursor = *io_cursor;; cursor = 0) {
blk = blst_meta_alloc(bl->bl_root, cursor, count, maxcount, blk = blst_meta_alloc(bl->bl_root, cursor, count, maxcount,
bl->bl_radix); bl->bl_radix);
if (blk != SWAPBLK_NONE) { if (blk != SWAPBLK_NONE) {
bl->bl_avail -= *count; bl->bl_avail -= *count;
bl->bl_cursor = blk + *count; *io_cursor = blk + *count;
if (bl->bl_cursor == bl->bl_blocks) if (*io_cursor == bl->bl_blocks)
bl->bl_cursor = 0; *io_cursor = 0;
return (blk); return (blk);
} }
if (cursor == 0) if (cursor == 0)
return (SWAPBLK_NONE); return (SWAPBLK_NONE);
} }
} }
/* /*
▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Lines
#ifdef BLIST_DEBUG #ifdef BLIST_DEBUG
/* /*
* blist_print() - dump radix tree * blist_print() - dump radix tree
*/ */
void void
blist_print(blist_t bl) blist_print(blist_t bl)
{ {
printf("BLIST avail = %jd, cursor = %08jx {\n", printf("BLIST avail = %jd {\n", (uintmax_t)bl->bl_avail);
(uintmax_t)bl->bl_avail, (uintmax_t)bl->bl_cursor);
if (bl->bl_root->bm_bitmap != 0) if (bl->bl_root->bm_bitmap != 0)
blst_radix_print(bl->bl_root, 0, bl->bl_radix, 4); blst_radix_print(bl->bl_root, 0, bl->bl_radix, 4);
printf("}\n"); printf("}\n");
} }
#endif #endif
▲ Show 20 Lines • Show All 801 Lines • Show Last 20 Lines
View Options

databases/mongodb50/files/patch-boost-179-link-fix

Show First 20 Lines • Show All 289 Lines • ▼ Show 20 Lines
} }
/* /*
* blist_alloc() - reserve space in the block bitmap. Return the base * blist_alloc() - reserve space in the block bitmap. Return the base
* of a contiguous region or SWAPBLK_NONE if space could * of a contiguous region or SWAPBLK_NONE if space could
* not be allocated. * not be allocated.
*/ */
daddr_t daddr_t
blist_alloc(blist_t bl, int *count, int maxcount) blist_alloc(blist_t bl, daddr_t *io_cursor, int *count, int maxcount)
{ {
daddr_t blk, cursor; daddr_t blk, cursor;
KASSERT(*count <= maxcount, KASSERT(*count <= maxcount,
("invalid parameters %d > %d", *count, maxcount)); ("invalid parameters %d > %d", *count, maxcount));
KASSERT(*count <= BLIST_MAX_ALLOC, KASSERT(*count <= BLIST_MAX_ALLOC,
("minimum allocation too large: %d", *count)); ("minimum allocation too large: %d", *count));
/* /*
* This loop iterates at most twice. An allocation failure in the * This loop iterates at most twice. An allocation failure in the
* first iteration leads to a second iteration only if the cursor was * first iteration leads to a second iteration only if the cursor was
* non-zero. When the cursor is zero, an allocation failure will * non-zero. When the cursor is zero, an allocation failure will
* stop further iterations. * stop further iterations.
*/ */
for (cursor = bl->bl_cursor;; cursor = 0) { for (cursor = *io_cursor;; cursor = 0) {
blk = blst_meta_alloc(bl->bl_root, cursor, count, maxcount, blk = blst_meta_alloc(bl->bl_root, cursor, count, maxcount,
bl->bl_radix); bl->bl_radix);
if (blk != SWAPBLK_NONE) { if (blk != SWAPBLK_NONE) {
bl->bl_avail -= *count; bl->bl_avail -= *count;
bl->bl_cursor = blk + *count; *io_cursor = blk + *count;
if (bl->bl_cursor == bl->bl_blocks) if (*io_cursor == bl->bl_blocks)
bl->bl_cursor = 0; *io_cursor = 0;
return (blk); return (blk);
} }
if (cursor == 0) if (cursor == 0)
return (SWAPBLK_NONE); return (SWAPBLK_NONE);
} }
} }
/* /*
▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Lines
#ifdef BLIST_DEBUG #ifdef BLIST_DEBUG
/* /*
* blist_print() - dump radix tree * blist_print() - dump radix tree
*/ */
void void
blist_print(blist_t bl) blist_print(blist_t bl)
{ {
printf("BLIST avail = %jd, cursor = %08jx {\n", printf("BLIST avail = %jd {\n", (uintmax_t)bl->bl_avail);
(uintmax_t)bl->bl_avail, (uintmax_t)bl->bl_cursor);
if (bl->bl_root->bm_bitmap != 0) if (bl->bl_root->bm_bitmap != 0)
blst_radix_print(bl->bl_root, 0, bl->bl_radix, 4); blst_radix_print(bl->bl_root, 0, bl->bl_radix, 4);
printf("}\n"); printf("}\n");
} }
#endif #endif
▲ Show 20 Lines • Show All 801 Lines • Show Last 20 Lines