Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
4706849b
Commit
4706849b
authored
Dec 05, 2016
by
Pedro Gonnet
Browse files
move recycling cells into a mapper, allow reclycling a linked list of cells in bulk.
parent
19d8695c
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/space.c
View file @
4706849b
...
...
@@ -173,17 +173,65 @@ int space_getsid(struct space *s, struct cell **ci, struct cell **cj,
* @param s The #space.
* @param c The #cell to recycle.
*/
void
space_rebuild_recycle
(
struct
space
*
s
,
struct
cell
*
c
)
{
void
space_rebuild_recycle
_rec
(
struct
space
*
s
,
struct
cell
*
c
,
struct
cell
**
rec_begin
,
struct
cell
**
rec_end
)
{
if
(
c
->
split
)
for
(
int
k
=
0
;
k
<
8
;
k
++
)
if
(
c
->
progeny
[
k
]
!=
NULL
)
{
space_rebuild_recycle
(
s
,
c
->
progeny
[
k
]);
space_recycle
(
s
,
c
->
progeny
[
k
]);
space_rebuild_recycle_rec
(
s
,
c
->
progeny
[
k
],
rec_begin
,
rec_end
);
c
->
progeny
[
k
]
->
next
=
*
rec_begin
;
*
rec_begin
=
c
->
progeny
[
k
];
if
(
*
rec_end
==
NULL
)
*
rec_end
=
*
rec_begin
;
c
->
progeny
[
k
]
=
NULL
;
}
}
void
space_rebuild_recycle_mapper
(
void
*
map_data
,
int
num_elements
,
void
*
extra_data
)
{
struct
space
*
s
=
(
struct
space
*
)
extra_data
;
struct
cell
*
cells
=
(
struct
cell
*
)
map_data
;
for
(
int
k
=
0
;
k
<
num_elements
;
k
++
)
{
struct
cell
*
c
=
&
cells
[
k
];
struct
cell
*
rec_begin
=
NULL
,
*
rec_end
=
NULL
;
space_rebuild_recycle_rec
(
s
,
c
,
&
rec_begin
,
&
rec_end
);
if
(
rec_begin
!=
NULL
)
space_recycle_list
(
s
,
rec_begin
,
rec_end
);
c
->
sorts
=
NULL
;
c
->
nr_tasks
=
0
;
c
->
density
=
NULL
;
c
->
gradient
=
NULL
;
c
->
force
=
NULL
;
c
->
grav
=
NULL
;
c
->
dx_max
=
0
.
0
f
;
c
->
sorted
=
0
;
c
->
count
=
0
;
c
->
gcount
=
0
;
c
->
init
=
NULL
;
c
->
extra_ghost
=
NULL
;
c
->
ghost
=
NULL
;
c
->
kick
=
NULL
;
c
->
cooling
=
NULL
;
c
->
sourceterms
=
NULL
;
c
->
super
=
c
;
if
(
c
->
sort
!=
NULL
)
{
free
(
c
->
sort
);
c
->
sort
=
NULL
;
}
#if WITH_MPI
c
->
recv_xv
=
NULL
;
c
->
recv_rho
=
NULL
;
c
->
recv_gradient
=
NULL
;
c
->
recv_ti
=
NULL
;
c
->
send_xv
=
NULL
;
c
->
send_rho
=
NULL
;
c
->
send_gradient
=
NULL
;
c
->
send_ti
=
NULL
;
#endif
}
}
/**
* @brief Re-build the top-level cell grid.
*
...
...
@@ -296,10 +344,8 @@ void space_regrid(struct space *s, int verbose) {
/* Free the old cells, if they were allocated. */
if
(
s
->
cells_top
!=
NULL
)
{
for
(
int
k
=
0
;
k
<
s
->
nr_cells
;
k
++
)
{
space_rebuild_recycle
(
s
,
&
s
->
cells_top
[
k
]);
if
(
s
->
cells_top
[
k
].
sort
!=
NULL
)
free
(
s
->
cells_top
[
k
].
sort
);
}
threadpool_map
(
&
s
->
e
->
threadpool
,
space_rebuild_recycle_mapper
,
s
->
cells_top
,
s
->
nr_cells
,
sizeof
(
struct
cell
),
100
,
s
);
free
(
s
->
cells_top
);
s
->
maxdepth
=
0
;
}
...
...
@@ -392,37 +438,8 @@ void space_regrid(struct space *s, int verbose) {
else
{
/* Otherwise, just clean up the cells. */
/* Free the old cells, if they were allocated. */
for
(
int
k
=
0
;
k
<
s
->
nr_cells
;
k
++
)
{
space_rebuild_recycle
(
s
,
&
s
->
cells_top
[
k
]);
s
->
cells_top
[
k
].
sorts
=
NULL
;
s
->
cells_top
[
k
].
nr_tasks
=
0
;
s
->
cells_top
[
k
].
density
=
NULL
;
s
->
cells_top
[
k
].
gradient
=
NULL
;
s
->
cells_top
[
k
].
force
=
NULL
;
s
->
cells_top
[
k
].
grav
=
NULL
;
s
->
cells_top
[
k
].
dx_max
=
0
.
0
f
;
s
->
cells_top
[
k
].
sorted
=
0
;
s
->
cells_top
[
k
].
count
=
0
;
s
->
cells_top
[
k
].
gcount
=
0
;
s
->
cells_top
[
k
].
init
=
NULL
;
s
->
cells_top
[
k
].
extra_ghost
=
NULL
;
s
->
cells_top
[
k
].
ghost
=
NULL
;
s
->
cells_top
[
k
].
kick
=
NULL
;
s
->
cells_top
[
k
].
cooling
=
NULL
;
s
->
cells_top
[
k
].
sourceterms
=
NULL
;
s
->
cells_top
[
k
].
super
=
&
s
->
cells_top
[
k
];
#if WITH_MPI
s
->
cells_top
[
k
].
recv_xv
=
NULL
;
s
->
cells_top
[
k
].
recv_rho
=
NULL
;
s
->
cells_top
[
k
].
recv_gradient
=
NULL
;
s
->
cells_top
[
k
].
recv_ti
=
NULL
;
s
->
cells_top
[
k
].
send_xv
=
NULL
;
s
->
cells_top
[
k
].
send_rho
=
NULL
;
s
->
cells_top
[
k
].
send_gradient
=
NULL
;
s
->
cells_top
[
k
].
send_ti
=
NULL
;
#endif
}
threadpool_map
(
&
s
->
e
->
threadpool
,
space_rebuild_recycle_mapper
,
s
->
cells_top
,
s
->
nr_cells
,
sizeof
(
struct
cell
),
100
,
s
);
s
->
maxdepth
=
0
;
}
...
...
@@ -1604,6 +1621,38 @@ void space_recycle(struct space *s, struct cell *c) {
lock_unlock_blind
(
&
s
->
lock
);
}
void
space_recycle_list
(
struct
space
*
s
,
struct
cell
*
list_begin
,
struct
cell
*
list_end
)
{
int
count
=
0
;
/* Clean up the list of cells. */
for
(
struct
cell
*
c
=
list_begin
;
c
!=
NULL
;
c
=
c
->
next
)
{
/* Clear the cell. */
if
(
lock_destroy
(
&
c
->
lock
)
!=
0
)
error
(
"Failed to destroy spinlock."
);
/* Clear this cell's sort arrays. */
if
(
c
->
sort
!=
NULL
)
free
(
c
->
sort
);
/* Clear the cell data. */
bzero
(
c
,
sizeof
(
struct
cell
));
/* Count this cell. */
count
+=
1
;
}
/* Lock the space. */
lock_lock
(
&
s
->
lock
);
/* Hook this cell into the buffer. */
list_end
->
next
=
s
->
cells_sub
;
s
->
cells_sub
=
list_begin
;
s
->
tot_cells
-=
count
;
/* Unlock the space. */
lock_unlock_blind
(
&
s
->
lock
);
}
/**
* @brief Get a new empty (sub-)#cell.
*
...
...
src/space.h
View file @
4706849b
...
...
@@ -171,6 +171,8 @@ void space_gparts_sort_mapper(void *map_data, int num_elements,
void
*
extra_data
);
void
space_rebuild
(
struct
space
*
s
,
int
verbose
);
void
space_recycle
(
struct
space
*
s
,
struct
cell
*
c
);
void
space_recycle_list
(
struct
space
*
s
,
struct
cell
*
list_begin
,
struct
cell
*
list_end
);
void
space_split
(
struct
space
*
s
,
struct
cell
*
cells
,
int
nr_cells
,
int
verbose
);
void
space_split_mapper
(
void
*
map_data
,
int
num_elements
,
void
*
extra_data
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment