diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-09-25 20:17:41 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-10-02 08:04:49 -0700 |
| commit | 6e343c734af619e620962f2ab26862c5c416300a (patch) | |
| tree | 87f0f8eb807528da9928182844aecf0a18429eda /core | |
| parent | eecca6aab0a1970c7474df7ac8408d810a5d0bbd (diff) | |
| download | subsurface-6e343c734af619e620962f2ab26862c5c416300a.tar.gz | |
Core: implement move functions for dive and dive_site table
To allow efficient moving of downloaded dives from the download
thread to the model, implement a general move function that
moves table data. Instantiate that function for the dive and
dive_site tables.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/divelist.c | 1 | ||||
| -rw-r--r-- | core/divelist.h | 1 | ||||
| -rw-r--r-- | core/divesite.c | 1 | ||||
| -rw-r--r-- | core/divesite.h | 1 | ||||
| -rw-r--r-- | core/table.h | 11 |
5 files changed, 15 insertions, 0 deletions
diff --git a/core/divelist.c b/core/divelist.c index 227528e18..c15ca8d3c 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -753,6 +753,7 @@ static MAKE_GET_IDX(dive_table, struct dive *, dives) MAKE_SORT(dive_table, struct dive *, dives, comp_dives) MAKE_REMOVE(dive_table, struct dive *, dive) MAKE_CLEAR_TABLE(dive_table, dives, dive) +MAKE_MOVE_TABLE(dive_table, dives) void insert_dive(struct dive_table *table, struct dive *d) { diff --git a/core/divelist.h b/core/divelist.h index 3c09d5400..dc3ab1302 100644 --- a/core/divelist.h +++ b/core/divelist.h @@ -60,6 +60,7 @@ void report_datafile_version(int version); int get_dive_id_closest_to(timestamp_t when); void clear_dive_file_data(); void clear_dive_table(struct dive_table *table); +void move_dive_table(struct dive_table *src, struct dive_table *dst); #ifdef DEBUG_TRIP extern void dump_selection(void); diff --git a/core/divesite.c b/core/divesite.c index 68ac6e98a..0ed4eb2ca 100644 --- a/core/divesite.c +++ b/core/divesite.c @@ -131,6 +131,7 @@ static MAKE_GET_IDX(dive_site_table, struct dive_site *, dive_sites) MAKE_SORT(dive_site_table, struct dive_site *, dive_sites, compare_sites) static MAKE_REMOVE(dive_site_table, struct dive_site *, dive_site) MAKE_CLEAR_TABLE(dive_site_table, dive_sites, dive_site) +MAKE_MOVE_TABLE(dive_site_table, dive_sites) int add_dive_site_to_table(struct dive_site *ds, struct dive_site_table *ds_table) { diff --git a/core/divesite.h b/core/divesite.h index 2dc64f81e..e5ef4d1b4 100644 --- a/core/divesite.h +++ b/core/divesite.h @@ -71,6 +71,7 @@ unsigned int get_distance(const location_t *loc1, const location_t *loc2); struct dive_site *find_or_create_dive_site_with_name(const char *name, struct dive_site_table *ds_table); void purge_empty_dive_sites(struct dive_site_table *ds_table); void clear_dive_site_table(struct dive_site_table *ds_table); +void move_dive_site_table(struct dive_site_table *src, struct dive_site_table *dst); void add_dive_to_dive_site(struct dive *d, struct dive_site *ds); struct dive_site *unregister_dive_from_dive_site(struct dive *d); diff --git a/core/table.h b/core/table.h index cf0be3bae..0f168f4bc 100644 --- a/core/table.h +++ b/core/table.h @@ -99,4 +99,15 @@ table->nr = 0; \ } +/* Move data of one table to the other - source table is empty after call. */ +#define MAKE_MOVE_TABLE(table_type, array_name) \ + void move_##table_type(struct table_type *src, struct table_type *dst) \ + { \ + clear_##table_type(dst); \ + free(dst->array_name); \ + *dst = *src; \ + src->nr = src->allocated = 0; \ + src->array_name = NULL; \ + } + #endif |