mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-05 00:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: use C++-style memory management for struct dir

Browse source 
The code is now much easier to check for memory leaks,
since there are no explicit free()s. Yes, memory is not
released immediately, but that should be of no concern.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-02-27 22:58:11 +01:00
parent 929e7ea23e
commit c2a5e3eb73
1 changed files with 47 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
core/save-git.cpp
View file

@ -15,6 +15,7 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <git2.h> #include <git2.h>
#include <memory>
#include "dive.h" #include "dive.h"
#include "divelog.h" #include "divelog.h"
@ -494,14 +495,25 @@ static void create_dive_buffer(struct dive *dive, struct membuffer *b)
*/ */
struct dir { struct dir {
git_treebuilder *files; git_treebuilder *files;
struct dir *subdirs, *sibling; std::vector<std::unique_ptr<dir>> subdirs;
char unique, name[1]; bool unique;
std::string name;
dir() : files(nullptr), unique(false)
{
}
~dir()
{
if (files)
git_treebuilder_free(files);
}
}; };
static int tree_insert(git_treebuilder *dir, const char *name, int mkunique, git_oid *id, git_filemode_t mode) static int tree_insert(git_treebuilder *dir, const char *name, int mkunique, git_oid *id, git_filemode_t mode)
{ {
int ret; int ret;
struct membuffer uniquename = { 0 }; membufferpp uniquename;
if (mkunique && git_treebuilder_get(dir, name)) { if (mkunique && git_treebuilder_get(dir, name)) {
char hex[8]; char hex[8];
@ -511,7 +523,6 @@ static int tree_insert(git_treebuilder *dir, const char *name, int mkunique, git
name = mb_cstring(&uniquename); name = mb_cstring(&uniquename);
} }
ret = git_treebuilder_insert(NULL, dir, name, id, mode); ret = git_treebuilder_insert(NULL, dir, name, id, mode);
free_buffer(&uniquename);
if (ret) { if (ret) {
const git_error *gerr = giterr_last(); const git_error *gerr = giterr_last();
if (gerr) { if (gerr) {
@ -530,47 +541,37 @@ static int tree_insert(git_treebuilder *dir, const char *name, int mkunique, git
*/ */
static struct dir *new_directory(git_repository *repo, struct dir *parent, struct membuffer *namebuf) static struct dir *new_directory(git_repository *repo, struct dir *parent, struct membuffer *namebuf)
{ {
struct dir *subdir; auto subdir = std::make_unique<dir>();
const char *name = mb_cstring(namebuf); subdir->name = mb_cstring(namebuf);
int len = namebuf->len;
subdir = (struct dir *)malloc(sizeof(*subdir)+len);
/* /*
* It starts out empty: no subdirectories of its own, * It starts out empty: no subdirectories of its own,
* and an empty treebuilder list of files. * and an empty treebuilder list of files.
*/ */
subdir->subdirs = NULL;
git_treebuilder_new(&subdir->files, repo, NULL); git_treebuilder_new(&subdir->files, repo, NULL);
memcpy(subdir->name, name, len);
subdir->unique = 0;
subdir->name[len] = 0;
/* Add it to the list of subdirs of the parent */ /* Add it to the list of subdirs of the parent
subdir->sibling = parent->subdirs; * Note: append at front. Do we want that?
parent->subdirs = subdir; */
parent->subdirs.insert(parent->subdirs.begin(), std::move(subdir));
return subdir; return parent->subdirs.front().get();
} }
static struct dir *mktree(git_repository *repo, struct dir *dir, const char *fmt, ...) static struct dir *mktree(git_repository *repo, struct dir *dir, const char *fmt, ...)
{ {
struct membuffer buf = { 0 }; membufferpp buf;
struct dir *subdir;
VA_BUF(&buf, fmt); VA_BUF(&buf, fmt);
for (subdir = dir->subdirs; subdir; subdir = subdir->sibling) { for (auto &subdir: dir->subdirs) {
if (subdir->unique) if (subdir->unique)
continue; continue;
if (strncmp(subdir->name, buf.buffer, buf.len)) if (strncmp(subdir->name.c_str(), buf.buffer, buf.len))
continue; continue;
if (!subdir->name[buf.len]) if (!subdir->name[buf.len])
break; return subdir.get();
} }
if (!subdir) return new_directory(repo, dir, &buf);
subdir = new_directory(repo, dir, &buf);
free_buffer(&buf);
return subdir;
} }
/* /*
@ -609,23 +610,21 @@ static int blob_insert(git_repository *repo, struct dir *tree, struct membuffer
{ {
int ret; int ret;
git_oid blob_id; git_oid blob_id;
struct membuffer name = { 0 }; struct membufferpp name;
ret = git_blob_create_frombuffer(&blob_id, repo, b->buffer, b->len); ret = git_blob_create_frombuffer(&blob_id, repo, b->buffer, b->len);
free_buffer(b);
if (ret) if (ret)
return ret; return ret;
VA_BUF(&name, fmt); VA_BUF(&name, fmt);
ret = tree_insert(tree->files, mb_cstring(&name), 1, &blob_id, GIT_FILEMODE_BLOB); ret = tree_insert(tree->files, mb_cstring(&name), 1, &blob_id, GIT_FILEMODE_BLOB);
free_buffer(&name);
return ret; return ret;
} }
static int save_one_divecomputer(git_repository *repo, struct dir *tree, struct dive *dive, struct divecomputer *dc, int idx) static int save_one_divecomputer(git_repository *repo, struct dir *tree, struct dive *dive, struct divecomputer *dc, int idx)
{ {
int ret; int ret;
struct membuffer buf = { 0 }; struct membufferpp buf;
save_dc(&buf, dive, dc); save_dc(&buf, dive, dc);
ret = blob_insert(repo, tree, &buf, "Divecomputer%c%03u", idx ? '-' : 0, idx); ret = blob_insert(repo, tree, &buf, "Divecomputer%c%03u", idx ? '-' : 0, idx);
@ -637,7 +636,7 @@ static int save_one_divecomputer(git_repository *repo, struct dir *tree, struct
static int save_one_picture(git_repository *repo, struct dir *dir, struct picture *pic) static int save_one_picture(git_repository *repo, struct dir *dir, struct picture *pic)
{ {
int offset = pic->offset.seconds; int offset = pic->offset.seconds;
struct membuffer buf = { 0 }; struct membufferpp buf;
char sign = '+'; char sign = '+';
unsigned h; unsigned h;
@ -671,7 +670,7 @@ static int save_pictures(git_repository *repo, struct dir *dir, struct dive *div
static int save_one_dive(git_repository *repo, struct dir *tree, struct dive *dive, struct tm *tm, bool cached_ok) static int save_one_dive(git_repository *repo, struct dir *tree, struct dive *dive, struct tm *tm, bool cached_ok)
{ {
struct divecomputer *dc; struct divecomputer *dc;
struct membuffer buf = { 0 }, name = { 0 }; struct membufferpp buf, name;
struct dir *subdir; struct dir *subdir;
int ret, nr; int ret, nr;
@ -687,15 +686,13 @@ static int save_one_dive(git_repository *repo, struct dir *tree, struct dive *di
git_oid_fromraw(&oid, dive->git_id); git_oid_fromraw(&oid, dive->git_id);
ret = tree_insert(tree->files, mb_cstring(&name), 1, ret = tree_insert(tree->files, mb_cstring(&name), 1,
&oid, GIT_FILEMODE_TREE); &oid, GIT_FILEMODE_TREE);
free_buffer(&name);
if (ret) if (ret)
return report_error("cached dive tree insert failed"); return report_error("cached dive tree insert failed");
return 0; return 0;
} }
subdir = new_directory(repo, tree, &name); subdir = new_directory(repo, tree, &name);
subdir->unique = 1; subdir->unique = true;
free_buffer(&name);
create_dive_buffer(dive, &buf); create_dive_buffer(dive, &buf);
nr = dive->number; nr = dive->number;
@ -773,7 +770,7 @@ static int save_trip_description(git_repository *repo, struct dir *dir, dive_tri
{ {
int ret; int ret;
git_oid blob_id; git_oid blob_id;
struct membuffer desc = { 0 }; struct membufferpp desc;
put_format(&desc, "date %04u-%02u-%02u\n", put_format(&desc, "date %04u-%02u-%02u\n",
tm->tm_year, tm->tm_mon + 1, tm->tm_mday); tm->tm_year, tm->tm_mon + 1, tm->tm_mday);
@ -784,7 +781,6 @@ static int save_trip_description(git_repository *repo, struct dir *dir, dive_tri
show_utf8(&desc, "notes ", trip->notes, "\n"); show_utf8(&desc, "notes ", trip->notes, "\n");
ret = git_blob_create_frombuffer(&blob_id, repo, desc.buffer, desc.len); ret = git_blob_create_frombuffer(&blob_id, repo, desc.buffer, desc.len);
free_buffer(&desc);
if (ret) if (ret)
return report_error("trip blob creation failed"); return report_error("trip blob creation failed");
ret = tree_insert(dir->files, "00-Trip", 0, &blob_id, GIT_FILEMODE_BLOB); ret = tree_insert(dir->files, "00-Trip", 0, &blob_id, GIT_FILEMODE_BLOB);
@ -814,14 +810,13 @@ static int save_one_trip(git_repository *repo, struct dir *tree, dive_trip_t *tr
int i; int i;
struct dive *dive; struct dive *dive;
struct dir *subdir; struct dir *subdir;
struct membuffer name = { 0 }; struct membufferpp name;
timestamp_t first, last; timestamp_t first, last;
/* Create trip directory */ /* Create trip directory */
create_trip_name(trip, &name, tm); create_trip_name(trip, &name, tm);
subdir = new_directory(repo, tree, &name); subdir = new_directory(repo, tree, &name);
subdir->unique = 1; subdir->unique = true;
free_buffer(&name);
/* Trip description file */ /* Trip description file */
save_trip_description(repo, subdir, trip, tm); save_trip_description(repo, subdir, trip, tm);
@ -898,7 +893,7 @@ static void save_one_fingerprint(struct membuffer *b, int i)
static void save_settings(git_repository *repo, struct dir *tree) static void save_settings(git_repository *repo, struct dir *tree)
{ {
struct membuffer b = { 0 }; struct membufferpp b;
put_format(&b, "version %d\n", DATAFORMAT_VERSION); put_format(&b, "version %d\n", DATAFORMAT_VERSION);
for (int i = 0; i < nr_devices(divelog.devices); i++) for (int i = 0; i < nr_devices(divelog.devices); i++)
@ -926,16 +921,15 @@ static void save_settings(git_repository *repo, struct dir *tree)
static void save_divesites(git_repository *repo, struct dir *tree) static void save_divesites(git_repository *repo, struct dir *tree)
{ {
struct dir *subdir; struct dir *subdir;
struct membuffer dirname = { 0 }; struct membufferpp dirname;
put_format(&dirname, "01-Divesites"); put_format(&dirname, "01-Divesites");
subdir = new_directory(repo, tree, &dirname); subdir = new_directory(repo, tree, &dirname);
free_buffer(&dirname);
purge_empty_dive_sites(divelog.sites); purge_empty_dive_sites(divelog.sites);
for (int i = 0; i < divelog.sites->nr; i++) { for (int i = 0; i < divelog.sites->nr; i++) {
struct membuffer b = { 0 }; struct membufferpp b;
struct dive_site *ds = get_dive_site(i, divelog.sites); struct dive_site *ds = get_dive_site(i, divelog.sites);
struct membuffer site_file_name = { 0 }; struct membufferpp site_file_name;
put_format(&site_file_name, "Site-%08x", ds->uuid); put_format(&site_file_name, "Site-%08x", ds->uuid);
show_utf8(&b, "name ", ds->name, "\n"); show_utf8(&b, "name ", ds->name, "\n");
show_utf8(&b, "description ", ds->description, "\n"); show_utf8(&b, "description ", ds->description, "\n");
@ -949,7 +943,6 @@ static void save_divesites(git_repository *repo, struct dir *tree)
} }
} }
blob_insert(repo, subdir, &b, mb_cstring(&site_file_name)); blob_insert(repo, subdir, &b, mb_cstring(&site_file_name));
free_buffer(&site_file_name);
} }
} }
@ -1014,24 +1007,20 @@ static void format_one_filter_preset(int preset_id, struct membuffer *b)
static void save_filter_presets(git_repository *repo, struct dir *tree) static void save_filter_presets(git_repository *repo, struct dir *tree)
{ {
struct membuffer dirname = { 0 }; struct membufferpp dirname;
struct dir *filter_dir; struct dir *filter_dir;
put_format(&dirname, "02-Filterpresets"); put_format(&dirname, "02-Filterpresets");
filter_dir = new_directory(repo, tree, &dirname); filter_dir = new_directory(repo, tree, &dirname);
free_buffer(&dirname);
for (int i = 0; i < filter_presets_count(); i++) for (int i = 0; i < filter_presets_count(); i++)
{ {
struct membuffer preset_name = { 0 }; membufferpp preset_name;
struct membuffer preset_buffer = { 0 }; membufferpp preset_buffer;
put_format(&preset_name, "Preset-%03d", i); put_format(&preset_name, "Preset-%03d", i);
format_one_filter_preset(i, &preset_buffer); format_one_filter_preset(i, &preset_buffer);
blob_insert(repo, filter_dir, &preset_buffer, mb_cstring(&preset_name)); blob_insert(repo, filter_dir, &preset_buffer, mb_cstring(&preset_name));
free_buffer(&preset_name);
free_buffer(&preset_buffer);
} }
} }
@ -1056,7 +1045,6 @@ static int create_git_tree(git_repository *repo, struct dir *root, bool select_o
struct tm tm; struct tm tm;
struct dir *tree; struct dir *tree;
trip = dive->divetrip; trip = dive->divetrip;
if (select_only) { if (select_only) {
@ -1244,14 +1232,13 @@ static int create_new_commit(struct git_info *info, git_oid *tree_id, bool creat
/* Else we do want to create the new branch, but with the old commit */ /* Else we do want to create the new branch, but with the old commit */
commit = (git_commit *) parent; commit = (git_commit *) parent;
} else { } else {
struct membuffer commit_msg = { 0 }; struct membufferpp commit_msg;
create_commit_message(&commit_msg, create_empty); create_commit_message(&commit_msg, create_empty);
if (git_commit_create_v(&commit_id, info->repo, NULL, author, author, NULL, mb_cstring(&commit_msg), tree, parent != NULL, parent)) { if (git_commit_create_v(&commit_id, info->repo, NULL, author, author, NULL, mb_cstring(&commit_msg), tree, parent != NULL, parent)) {
git_signature_free(author); git_signature_free(author);
return report_error("Git commit create failed (%s)", strerror(errno)); return report_error("Git commit create failed (%s)", strerror(errno));
} }
free_buffer(&commit_msg);
if (git_commit_lookup(&commit, info->repo, &commit_id)) { if (git_commit_lookup(&commit, info->repo, &commit_id)) {
git_signature_free(author); git_signature_free(author);
@ -1295,19 +1282,16 @@ static int create_new_commit(struct git_info *info, git_oid *tree_id, bool creat
return 0; return 0;
} }
static int write_git_tree(git_repository *repo, struct dir *tree, git_oid *result) static int write_git_tree(git_repository *repo, const struct dir *tree, git_oid *result)
{ {
int ret; int ret;
struct dir *subdir;
/* Write out our subdirectories, add them to the treebuilder, and free them */ /* Write out our subdirectories, add them to the treebuilder, and free them */
while ((subdir = tree->subdirs) != NULL) { for (auto &subdir: tree->subdirs) {
git_oid id; git_oid id;
if (!write_git_tree(repo, subdir, &id)) if (!write_git_tree(repo, subdir.get(), &id))
tree_insert(tree->files, subdir->name, subdir->unique, &id, GIT_FILEMODE_TREE); tree_insert(tree->files, subdir->name.c_str(), subdir->unique, &id, GIT_FILEMODE_TREE);
tree->subdirs = subdir->sibling;
free(subdir);
}; };
/* .. write out the resulting treebuilder */ /* .. write out the resulting treebuilder */
@ -1318,9 +1302,6 @@ static int write_git_tree(git_repository *repo, struct dir *tree, git_oid *resul
SSRF_INFO("tree_insert failed with return %d error %s\n", ret, gerr->message); SSRF_INFO("tree_insert failed with return %d error %s\n", ret, gerr->message);
} }
/* .. and free the now useless treebuilder */
git_treebuilder_free(tree->files);
return ret; return ret;
} }
@ -1346,8 +1327,6 @@ extern "C" int do_git_save(struct git_info *info, bool select_only, bool create_
cached_ok = try_to_find_parent(saved_git_id, info->repo); cached_ok = try_to_find_parent(saved_git_id, info->repo);
/* Start with an empty tree: no subdirectories, no files */ /* Start with an empty tree: no subdirectories, no files */
tree.name[0] = 0;
tree.subdirs = NULL;
if (git_treebuilder_new(&tree.files, info->repo, NULL)) if (git_treebuilder_new(&tree.files, info->repo, NULL))
return report_error("git treebuilder failed"); return report_error("git treebuilder failed");