From: Tracey Emery Subject: Re: Move got_opentempfd out of got_repo_open To: gameoftrees@openbsd.org Date: Tue, 14 Jun 2022 14:47:37 -0600 On Tue, Jun 14, 2022 at 07:34:24AM -0600, Tracey Emery wrote: I think this is fairly sane now. ok? -- Tracey Emery diff ffe3518f1b3ac78ceeac8b605cb0eec2006bae67 f54e6b8419ac1d3721d0849e86590b4aa367dc61 blob - 4820a2165e94f15daabdf5007b667947b46f6049 blob + 98f3281d5becb5173121e9f4f0b74eee3b61bebf --- got/got.c +++ got/got.c @@ -715,6 +715,7 @@ cmd_import(int argc, char *argv[]) struct got_pathlist_head ignores; struct got_pathlist_entry *pe; int preserve_logmsg = 0; + int *pack_fds = NULL; TAILQ_INIT(&ignores); @@ -773,7 +774,10 @@ cmd_import(int argc, char *argv[]) error = get_gitconfig_path(&gitconfig_path); if (error) goto done; - error = got_repo_open(&repo, repo_path, gitconfig_path); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds); if (error) goto done; @@ -900,6 +904,12 @@ cmd_import(int argc, char *argv[]) printf("Created branch %s with commit %s\n", got_ref_get_name(branch_ref), id_str); done: + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } if (preserve_logmsg) { fprintf(stderr, "%s: log message preserved in %s\n", getprogname(), logmsg_path); @@ -1484,6 +1494,7 @@ cmd_clone(int argc, char *argv[]) char *git_url = NULL; int verbosity = 0, fetch_all_branches = 0, mirror_references = 0; int list_refs_only = 0; + int *pack_fds = NULL; TAILQ_INIT(&refs); TAILQ_INIT(&symrefs); @@ -1628,7 +1639,10 @@ cmd_clone(int argc, char *argv[]) error = got_repo_init(repo_path); if (error) goto done; - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error) goto done; } @@ -1806,6 +1820,12 @@ cmd_clone(int argc, char *argv[]) printf("Created %s repository '%s'\n", mirror_references ? "mirrored" : "cloned", repo_path); done: + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } if (fetchpid > 0) { if (kill(fetchpid, SIGTERM) == -1) error = got_error_from_errno("kill"); @@ -2212,6 +2232,7 @@ cmd_fetch(int argc, char *argv[]) struct got_fetch_progress_arg fpa; int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0; int delete_refs = 0, replace_tags = 0, delete_remote = 0; + int *pack_fds = NULL; TAILQ_INIT(&refs); TAILQ_INIT(&symrefs); @@ -2311,6 +2332,10 @@ cmd_fetch(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { error = got_worktree_open(&worktree, cwd); if (error && error->code != GOT_ERR_NOT_WORKTREE) @@ -2333,7 +2358,7 @@ cmd_fetch(int argc, char *argv[]) } } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error) goto done; @@ -2621,6 +2646,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } TAILQ_FOREACH(pe, &refs, entry) { free((void *)pe->path); free(pe->data); @@ -2848,6 +2879,7 @@ cmd_checkout(int argc, char *argv[]) int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0; struct got_pathlist_head paths; struct got_checkout_progress_arg cpa; + int *pack_fds = NULL; TAILQ_INIT(&paths); @@ -2936,10 +2968,14 @@ cmd_checkout(int argc, char *argv[]) got_path_strip_trailing_slashes(repo_path); got_path_strip_trailing_slashes(worktree_path); - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_pack_fds_open(&pack_fds); if (error != NULL) goto done; + error = got_repo_open(&repo, repo_path, NULL, pack_fds); + if (error != NULL) + goto done; + /* Pre-create work tree path for unveil(2) */ error = got_path_mkdir(worktree_path); if (error) { @@ -3052,6 +3088,12 @@ cmd_checkout(int argc, char *argv[]) if (cpa.had_base_commit_ref_error) show_worktree_base_ref_warning(); done: + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } if (head_ref) got_ref_close(head_ref); if (ref) @@ -3281,9 +3323,14 @@ wrap_not_worktree_error(const struct got_error *orig_e const struct got_error *err; struct got_repository *repo; static char msg[512]; + int *pack_fds = NULL; - err = got_repo_open(&repo, path, NULL); + err = got_repo_pack_fds_open(&pack_fds); if (err) + return err; + + err = got_repo_open(&repo, path, NULL, pack_fds); + if (err) return orig_err; snprintf(msg, sizeof(msg), @@ -3293,6 +3340,12 @@ wrap_not_worktree_error(const struct got_error *orig_e "The got(1) manual page contains more information.", cmdname); err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg); got_repo_close(repo); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (err == NULL) + err = pack_err; + } return err; } @@ -3311,6 +3364,7 @@ cmd_update(int argc, char *argv[]) struct got_pathlist_entry *pe; int ch, verbosity = 0; struct got_update_progress_arg upa; + int *pack_fds = NULL; TAILQ_INIT(&paths); @@ -3346,6 +3400,11 @@ cmd_update(int argc, char *argv[]) error = got_error_from_errno("getcwd"); goto done; } + + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, worktree_path); if (error) { if (error->code == GOT_ERR_NOT_WORKTREE) @@ -3359,7 +3418,7 @@ cmd_update(int argc, char *argv[]) goto done; error = got_repo_open(&repo, got_worktree_get_repo_path(worktree), - NULL); + NULL, pack_fds); if (error != NULL) goto done; @@ -3463,8 +3522,15 @@ cmd_update(int argc, char *argv[]) got_worktree_get_head_ref_name(worktree), commit_id_str); } else printf("Already up-to-date\n"); + print_update_progress_stats(&upa); done: + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } free(worktree_path); TAILQ_FOREACH(pe, &paths, entry) free((char *)pe->path); @@ -4250,6 +4316,7 @@ cmd_log(int argc, char *argv[]) struct got_reflist_head refs; struct got_reflist_object_id_map *refs_idmap = NULL; FILE *tmpfile = NULL; + int *pack_fds = NULL; TAILQ_INIT(&refs); @@ -4331,6 +4398,10 @@ cmd_log(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { error = got_worktree_open(&worktree, cwd); if (error && error->code != GOT_ERR_NOT_WORKTREE) @@ -4363,7 +4434,7 @@ cmd_log(int argc, char *argv[]) goto done; } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error != NULL) goto done; @@ -4464,6 +4535,12 @@ done: if (error == NULL) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } if (refs_idmap) got_reflist_object_id_map_free(refs_idmap); if (tmpfile && fclose(tmpfile) == EOF && error == NULL) @@ -4726,6 +4803,7 @@ cmd_diff(int argc, char *argv[]) struct got_pathlist_head paths; struct got_pathlist_entry *pe; FILE *f1 = NULL, *f2 = NULL; + int *pack_fds = NULL; TAILQ_INIT(&refs); TAILQ_INIT(&paths); @@ -4785,6 +4863,10 @@ cmd_diff(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { error = got_worktree_open(&worktree, cwd); if (error && error->code != GOT_ERR_NOT_WORKTREE) @@ -4807,7 +4889,7 @@ cmd_diff(int argc, char *argv[]) } } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); free(repo_path); if (error != NULL) goto done; @@ -5062,6 +5144,12 @@ done: if (error == NULL) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } TAILQ_FOREACH(pe, &paths, entry) free((char *)pe->path); got_pathlist_free(&paths); @@ -5208,6 +5296,7 @@ cmd_blame(int argc, char *argv[]) struct blame_cb_args bca; int ch, obj_type, i; off_t filesize; + int *pack_fds = NULL; memset(&bca, 0, sizeof(bca)); @@ -5248,6 +5337,11 @@ cmd_blame(int argc, char *argv[]) error = got_error_from_errno("getcwd"); goto done; } + + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { error = got_worktree_open(&worktree, cwd); if (error && error->code != GOT_ERR_NOT_WORKTREE) @@ -5271,7 +5365,7 @@ cmd_blame(int argc, char *argv[]) } } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error != NULL) goto done; @@ -5405,6 +5499,12 @@ done: if (error == NULL) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } if (bca.lines) { for (i = 0; i < bca.nlines; i++) { struct blame_line *bline = &bca.lines[i]; @@ -5549,6 +5649,7 @@ cmd_tree(int argc, char *argv[]) char *commit_id_str = NULL; int show_ids = 0, recurse = 0; int ch; + int *pack_fds = NULL; #ifndef PROFILE if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil", @@ -5595,6 +5696,11 @@ cmd_tree(int argc, char *argv[]) error = got_error_from_errno("getcwd"); goto done; } + + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { error = got_worktree_open(&worktree, cwd); if (error && error->code != GOT_ERR_NOT_WORKTREE) @@ -5617,7 +5723,7 @@ cmd_tree(int argc, char *argv[]) } } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error != NULL) goto done; @@ -5705,6 +5811,12 @@ done: if (error == NULL) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } return error; } @@ -5771,6 +5883,7 @@ cmd_status(int argc, char *argv[]) struct got_pathlist_head paths; struct got_pathlist_entry *pe; int ch, i, no_ignores = 0; + int *pack_fds = NULL; TAILQ_INIT(&paths); @@ -5830,6 +5943,10 @@ cmd_status(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (error->code == GOT_ERR_NOT_WORKTREE) @@ -5838,7 +5955,7 @@ cmd_status(int argc, char *argv[]) } error = got_repo_open(&repo, got_worktree_get_repo_path(worktree), - NULL); + NULL, pack_fds); if (error != NULL) goto done; @@ -5854,6 +5971,13 @@ cmd_status(int argc, char *argv[]) error = got_worktree_status(worktree, &paths, repo, no_ignores, print_status, &st, check_cancelled, NULL); done: + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } + TAILQ_FOREACH(pe, &paths, entry) free((char *)pe->path); got_pathlist_free(&paths); @@ -5995,6 +6119,7 @@ cmd_ref(int argc, char *argv[]) int ch, do_list = 0, do_delete = 0, sort_by_time = 0; const char *obj_arg = NULL, *symref_target= NULL; char *refname = NULL; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "c:dr:ls:t")) != -1) { switch (ch) { @@ -6078,6 +6203,10 @@ cmd_ref(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { error = got_worktree_open(&worktree, cwd); if (error && error->code != GOT_ERR_NOT_WORKTREE) @@ -6100,7 +6229,7 @@ cmd_ref(int argc, char *argv[]) } } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error != NULL) goto done; @@ -6138,6 +6267,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } free(cwd); free(repo_path); return error; @@ -6385,6 +6520,7 @@ cmd_branch(int argc, char *argv[]) struct got_pathlist_entry *pe; struct got_object_id *commit_id = NULL; char *commit_id_str = NULL; + int *pack_fds = NULL; TAILQ_INIT(&paths); @@ -6449,6 +6585,10 @@ cmd_branch(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { error = got_worktree_open(&worktree, cwd); if (error && error->code != GOT_ERR_NOT_WORKTREE) @@ -6471,7 +6611,7 @@ cmd_branch(int argc, char *argv[]) } } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error != NULL) goto done; @@ -6566,6 +6706,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } free(cwd); free(repo_path); free(commit_id); @@ -6943,6 +7089,7 @@ cmd_tag(int argc, char *argv[]) char *gitconfig_path = NULL, *tagger = NULL; const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL; int ch, do_list = 0; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) { switch (ch) { @@ -6995,6 +7142,10 @@ cmd_tag(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { error = got_worktree_open(&worktree, cwd); if (error && error->code != GOT_ERR_NOT_WORKTREE) @@ -7023,9 +7174,10 @@ cmd_tag(int argc, char *argv[]) got_worktree_close(worktree); worktree = NULL; } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error != NULL) goto done; + #ifndef PROFILE /* Remove "cpath" promise. */ if (pledge("stdio rpath wpath flock proc exec sendfd unveil", @@ -7040,7 +7192,8 @@ cmd_tag(int argc, char *argv[]) error = get_gitconfig_path(&gitconfig_path); if (error) goto done; - error = got_repo_open(&repo, repo_path, gitconfig_path); + error = got_repo_open(&repo, repo_path, gitconfig_path, + pack_fds); if (error != NULL) goto done; @@ -7088,6 +7241,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } free(cwd); free(repo_path); free(gitconfig_path); @@ -7123,6 +7282,7 @@ cmd_add(int argc, char *argv[]) struct got_pathlist_head paths; struct got_pathlist_entry *pe; int ch, can_recurse = 0, no_ignores = 0; + int *pack_fds = NULL; TAILQ_INIT(&paths); @@ -7157,6 +7317,10 @@ cmd_add(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (error->code == GOT_ERR_NOT_WORKTREE) @@ -7165,7 +7329,7 @@ cmd_add(int argc, char *argv[]) } error = got_repo_open(&repo, got_worktree_get_repo_path(worktree), - NULL); + NULL, pack_fds); if (error != NULL) goto done; @@ -7217,6 +7381,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } TAILQ_FOREACH(pe, &paths, entry) free((char *)pe->path); got_pathlist_free(&paths); @@ -7258,6 +7428,7 @@ cmd_remove(int argc, char *argv[]) struct got_pathlist_entry *pe; int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i; int ignore_missing_paths = 0; + int *pack_fds = NULL; TAILQ_INIT(&paths); @@ -7311,6 +7482,11 @@ cmd_remove(int argc, char *argv[]) error = got_error_from_errno("getcwd"); goto done; } + + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (error->code == GOT_ERR_NOT_WORKTREE) @@ -7319,7 +7495,7 @@ cmd_remove(int argc, char *argv[]) } error = got_repo_open(&repo, got_worktree_get_repo_path(worktree), - NULL); + NULL, pack_fds); if (error) goto done; @@ -7372,6 +7548,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } TAILQ_FOREACH(pe, &paths, entry) free((char *)pe->path); got_pathlist_free(&paths); @@ -7474,6 +7656,7 @@ cmd_patch(int argc, char *argv[]) char *cwd = NULL; int ch, nop = 0, strip = -1, reverse = 0; int patchfd; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "np:R")) != -1) { switch (ch) { @@ -7516,12 +7699,16 @@ cmd_patch(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error != NULL) goto done; const char *repo_path = got_worktree_get_repo_path(worktree); - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error != NULL) goto done; @@ -7550,6 +7737,12 @@ done: if (error == NULL) error = close_error; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } free(cwd); return error; } @@ -7704,6 +7897,7 @@ cmd_revert(int argc, char *argv[]) FILE *patch_script_file = NULL; const char *patch_script_path = NULL; struct choose_patch_arg cpa; + int *pack_fds = NULL; TAILQ_INIT(&paths); @@ -7742,6 +7936,11 @@ cmd_revert(int argc, char *argv[]) error = got_error_from_errno("getcwd"); goto done; } + + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (error->code == GOT_ERR_NOT_WORKTREE) @@ -7750,7 +7949,7 @@ cmd_revert(int argc, char *argv[]) } error = got_repo_open(&repo, got_worktree_get_repo_path(worktree), - NULL); + NULL, pack_fds); if (error != NULL) goto done; @@ -7815,6 +8014,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } free(path); free(cwd); return error; @@ -7988,6 +8193,7 @@ cmd_commit(int argc, char *argv[]) int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0; int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0; struct got_pathlist_head paths; + int *pack_fds = NULL; TAILQ_INIT(&paths); cl_arg.logmsg_path = NULL; @@ -8032,6 +8238,11 @@ cmd_commit(int argc, char *argv[]) error = got_error_from_errno("getcwd"); goto done; } + + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (error->code == GOT_ERR_NOT_WORKTREE) @@ -8056,7 +8267,7 @@ cmd_commit(int argc, char *argv[]) if (error) goto done; error = got_repo_open(&repo, got_worktree_get_repo_path(worktree), - gitconfig_path); + gitconfig_path, pack_fds); if (error != NULL) goto done; @@ -8131,6 +8342,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } free(cwd); free(id_str); free(gitconfig_path); @@ -8367,6 +8584,7 @@ cmd_send(int argc, char *argv[]) int verbosity = 0, overwrite_refs = 0; int send_all_branches = 0, send_all_tags = 0; struct got_reference *ref = NULL; + int *pack_fds = NULL; TAILQ_INIT(&branches); TAILQ_INIT(&tags); @@ -8446,6 +8664,10 @@ cmd_send(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { error = got_worktree_open(&worktree, cwd); if (error && error->code != GOT_ERR_NOT_WORKTREE) @@ -8468,7 +8690,7 @@ cmd_send(int argc, char *argv[]) } } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error) goto done; @@ -8674,6 +8896,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } if (ref) got_ref_close(ref); got_pathlist_free(&branches); @@ -8713,6 +8941,7 @@ cmd_cherrypick(int argc, char *argv[]) struct got_object_qid *pid; int ch; struct got_update_progress_arg upa; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "")) != -1) { switch (ch) { @@ -8738,6 +8967,11 @@ cmd_cherrypick(int argc, char *argv[]) error = got_error_from_errno("getcwd"); goto done; } + + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (error->code == GOT_ERR_NOT_WORKTREE) @@ -8747,7 +8981,7 @@ cmd_cherrypick(int argc, char *argv[]) } error = got_repo_open(&repo, got_worktree_get_repo_path(worktree), - NULL); + NULL, pack_fds); if (error != NULL) goto done; @@ -8789,6 +9023,13 @@ done: if (error == NULL) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } + return error; } @@ -8811,6 +9052,7 @@ cmd_backout(int argc, char *argv[]) struct got_object_qid *pid; int ch; struct got_update_progress_arg upa; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "")) != -1) { switch (ch) { @@ -8836,6 +9078,11 @@ cmd_backout(int argc, char *argv[]) error = got_error_from_errno("getcwd"); goto done; } + + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (error->code == GOT_ERR_NOT_WORKTREE) @@ -8844,7 +9091,7 @@ cmd_backout(int argc, char *argv[]) } error = got_repo_open(&repo, got_worktree_get_repo_path(worktree), - NULL); + NULL, pack_fds); if (error != NULL) goto done; @@ -8890,6 +9137,12 @@ done: if (error == NULL) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } return error; } @@ -9474,6 +9727,7 @@ cmd_rebase(int argc, char *argv[]) const struct got_object_id_queue *parent_ids; struct got_object_qid *qid, *pid; struct got_update_progress_arg upa; + int *pack_fds = NULL; STAILQ_INIT(&commits); TAILQ_INIT(&merged_paths); @@ -9540,6 +9794,11 @@ cmd_rebase(int argc, char *argv[]) error = got_error_from_errno("getcwd"); goto done; } + + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (list_backups || delete_backups) { @@ -9554,7 +9813,8 @@ cmd_rebase(int argc, char *argv[]) } error = got_repo_open(&repo, - worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL); + worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL, + pack_fds); if (error != NULL) goto done; @@ -9839,6 +10099,12 @@ done: if (error == NULL) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } return error; } @@ -10693,6 +10959,7 @@ cmd_histedit(int argc, char *argv[]) struct got_object_qid *pid; struct got_histedit_list histedit_cmds; struct got_histedit_list_entry *hle; + int *pack_fds = NULL; STAILQ_INIT(&commits); TAILQ_INIT(&histedit_cmds); @@ -10814,6 +11081,11 @@ cmd_histedit(int argc, char *argv[]) error = got_error_from_errno("getcwd"); goto done; } + + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (list_backups || delete_backups) { @@ -10830,7 +11102,7 @@ cmd_histedit(int argc, char *argv[]) if (list_backups || delete_backups) { error = got_repo_open(&repo, worktree ? got_worktree_get_repo_path(worktree) : cwd, - NULL); + NULL, pack_fds); if (error != NULL) goto done; error = apply_unveil(got_repo_get_path(repo), 0, @@ -10844,7 +11116,7 @@ cmd_histedit(int argc, char *argv[]) } error = got_repo_open(&repo, got_worktree_get_repo_path(worktree), - NULL); + NULL, pack_fds); if (error != NULL) goto done; @@ -11214,6 +11486,12 @@ done: if (error == NULL) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } return error; } @@ -11237,6 +11515,7 @@ cmd_integrate(int argc, char *argv[]) struct got_object_id *commit_id = NULL, *base_commit_id = NULL; int ch; struct got_update_progress_arg upa; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "")) != -1) { switch (ch) { @@ -11263,6 +11542,10 @@ cmd_integrate(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (error->code == GOT_ERR_NOT_WORKTREE) @@ -11276,7 +11559,7 @@ cmd_integrate(int argc, char *argv[]) goto done; error = got_repo_open(&repo, got_worktree_get_repo_path(worktree), - NULL); + NULL, pack_fds); if (error != NULL) goto done; @@ -11356,6 +11639,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } free(cwd); free(base_commit_id); free(commit_id); @@ -11388,6 +11677,7 @@ cmd_merge(int argc, char *argv[]) struct got_update_progress_arg upa; struct got_object_id *merge_commit_id = NULL; char *branch_name = NULL; + int *pack_fds = NULL; memset(&upa, 0, sizeof(upa)); @@ -11431,6 +11721,10 @@ cmd_merge(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (error->code == GOT_ERR_NOT_WORKTREE) @@ -11440,7 +11734,8 @@ cmd_merge(int argc, char *argv[]) } error = got_repo_open(&repo, - worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL); + worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL, + pack_fds); if (error != NULL) goto done; @@ -11626,6 +11921,12 @@ done: if (error == NULL) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } return error; } @@ -11678,6 +11979,7 @@ cmd_stage(int argc, char *argv[]) FILE *patch_script_file = NULL; const char *patch_script_path = NULL; struct choose_patch_arg cpa; + int *pack_fds = NULL; TAILQ_INIT(&paths); @@ -11720,6 +12022,10 @@ cmd_stage(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (error->code == GOT_ERR_NOT_WORKTREE) @@ -11728,7 +12034,7 @@ cmd_stage(int argc, char *argv[]) } error = got_repo_open(&repo, got_worktree_get_repo_path(worktree), - NULL); + NULL, pack_fds); if (error != NULL) goto done; @@ -11775,6 +12081,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } TAILQ_FOREACH(pe, &paths, entry) free((char *)pe->path); got_pathlist_free(&paths); @@ -11806,6 +12118,7 @@ cmd_unstage(int argc, char *argv[]) FILE *patch_script_file = NULL; const char *patch_script_path = NULL; struct choose_patch_arg cpa; + int *pack_fds = NULL; TAILQ_INIT(&paths); @@ -11840,6 +12153,10 @@ cmd_unstage(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (error->code == GOT_ERR_NOT_WORKTREE) @@ -11848,7 +12165,7 @@ cmd_unstage(int argc, char *argv[]) } error = got_repo_open(&repo, got_worktree_get_repo_path(worktree), - NULL); + NULL, pack_fds); if (error != NULL) goto done; @@ -11888,6 +12205,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } TAILQ_FOREACH(pe, &paths, entry) free((char *)pe->path); got_pathlist_free(&paths); @@ -12090,6 +12413,7 @@ cmd_cat(int argc, char *argv[]) struct got_commit_object *commit = NULL; int ch, obj_type, i, force_path = 0; struct got_reflist_head refs; + int *pack_fds = NULL; TAILQ_INIT(&refs); @@ -12129,6 +12453,10 @@ cmd_cat(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { error = got_worktree_open(&worktree, cwd); if (error && error->code != GOT_ERR_NOT_WORKTREE) @@ -12153,7 +12481,7 @@ cmd_cat(int argc, char *argv[]) return got_error_from_errno("strdup"); } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); free(repo_path); if (error != NULL) goto done; @@ -12239,6 +12567,13 @@ done: if (error == NULL) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } + got_ref_list_free(&refs); return error; } @@ -12329,6 +12664,7 @@ cmd_info(int argc, char *argv[]) struct got_pathlist_entry *pe; char *uuidstr = NULL; int ch, show_files = 0; + int *pack_fds = NULL; TAILQ_INIT(&paths); @@ -12354,6 +12690,10 @@ cmd_info(int argc, char *argv[]) goto done; } + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error) { if (error->code == GOT_ERR_NOT_WORKTREE) @@ -12421,6 +12761,12 @@ cmd_info(int argc, char *argv[]) } } done: + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } TAILQ_FOREACH(pe, &paths, entry) free((char *)pe->path); got_pathlist_free(&paths); blob - 59c11d1ab01684d8a2f16d934fb1d6870d7ac871 blob + d2e712fec877f56e6a3e85c0e93d10cc4ce1a702 --- gotadmin/gotadmin.c +++ gotadmin/gotadmin.c @@ -275,6 +275,7 @@ cmd_info(int argc, char *argv[]) int ch, npackfiles, npackedobj, nobj; off_t packsize, loose_size; char scaled[FMT_SCALED_STRSIZE]; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "r:")) != -1) { switch (ch) { @@ -304,7 +305,10 @@ cmd_info(int argc, char *argv[]) if (error) goto done; } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error) goto done; #ifndef PROFILE @@ -371,6 +375,13 @@ cmd_info(int argc, char *argv[]) done: if (repo) got_repo_close(repo); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } + free(repo_path); return error; } @@ -629,6 +640,7 @@ cmd_pack(int argc, char *argv[]) struct got_reflist_head exclude_refs; struct got_reflist_head include_refs; struct got_reflist_entry *re, *new; + int *pack_fds = NULL; TAILQ_INIT(&exclude_args); TAILQ_INIT(&exclude_refs); @@ -675,7 +687,10 @@ cmd_pack(int argc, char *argv[]) if (error) goto done; } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error) goto done; @@ -747,6 +762,12 @@ cmd_pack(int argc, char *argv[]) done: if (repo) got_repo_close(repo); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } got_pathlist_free(&exclude_args); got_ref_list_free(&exclude_refs); got_ref_list_free(&include_refs); @@ -775,6 +796,7 @@ cmd_indexpack(int argc, char *argv[]) char *id_str = NULL; struct got_pack_progress_arg ppa; FILE *packfile = NULL; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "")) != -1) { switch (ch) { @@ -800,7 +822,10 @@ cmd_indexpack(int argc, char *argv[]) err(1, "pledge"); #endif - error = got_repo_open(&repo, packfile_path, NULL); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_repo_open(&repo, packfile_path, NULL, pack_fds); if (error) goto done; @@ -830,6 +855,12 @@ cmd_indexpack(int argc, char *argv[]) done: if (repo) got_repo_close(repo); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } free(id_str); free(pack_hash); return error; @@ -862,7 +893,7 @@ list_pack_cb(void *arg, struct got_object_id *id, int char *id_str, *delta_str = NULL, *base_id_str = NULL; const char *type_str; - err = got_object_id_str(&id_str, id); + err = got_object_id_str(&id_str, id); if (err) return err; @@ -943,6 +974,7 @@ cmd_listpack(int argc, char *argv[]) struct gotadmin_list_pack_cb_args lpa; FILE *packfile = NULL; int show_stats = 0, human_readable = 0; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "hs")) != -1) { switch (ch) { @@ -972,7 +1004,10 @@ cmd_listpack(int argc, char *argv[]) NULL) == -1) err(1, "pledge"); #endif - error = got_repo_open(&repo, packfile_path, NULL); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_repo_open(&repo, packfile_path, NULL, pack_fds); if (error) goto done; #ifndef PROFILE @@ -1010,6 +1045,12 @@ cmd_listpack(int argc, char *argv[]) done: if (repo) got_repo_close(repo); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } free(id_str); free(pack_hash); free(packfile_path); @@ -1120,6 +1161,7 @@ cmd_cleanup(int argc, char *argv[]) char scaled_diff[FMT_SCALED_STRSIZE]; char **extensions; int nextensions, i; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "apr:nq")) != -1) { switch (ch) { @@ -1161,7 +1203,10 @@ cmd_cleanup(int argc, char *argv[]) if (error) goto done; } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error) goto done; @@ -1226,6 +1271,12 @@ cmd_cleanup(int argc, char *argv[]) done: if (repo) got_repo_close(repo); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } free(repo_path); return error; } blob - 613976ee0e8a3f55e862ceb0aa730fd85f3e46e3 blob + 156fdc229cc2ed2c606d5aded919cc4fa7adeaad --- gotweb/gotweb.c +++ gotweb/gotweb.c @@ -568,7 +568,7 @@ gw_index(struct gw_trans *gw_trans) enum kcgi_err kerr = KCGI_OK; #ifndef PROFILE - if (pledge("stdio rpath proc exec sendfd unveil", + if (pledge("stdio rpath wpath cpath proc exec sendfd unveil", NULL) == -1) { error = got_error_from_errno("pledge"); return error; @@ -972,7 +972,7 @@ gw_commits(struct gw_trans *gw_trans) return got_error_from_errno("malloc"); #ifndef PROFILE - if (pledge("stdio rpath proc exec sendfd unveil", + if (pledge("stdio rpath wpath cpath proc exec sendfd unveil", NULL) == -1) { error = got_error_from_errno("pledge"); goto done; @@ -1199,7 +1199,7 @@ gw_briefs(struct gw_trans *gw_trans) return got_error_from_errno("malloc"); #ifndef PROFILE - if (pledge("stdio rpath proc exec sendfd unveil", + if (pledge("stdio rpath wpath cpath proc exec sendfd unveil", NULL) == -1) { error = got_error_from_errno("pledge"); goto done; @@ -1459,7 +1459,8 @@ gw_summary(struct gw_trans *gw_trans) enum kcgi_err kerr = KCGI_OK; #ifndef PROFILE - if (pledge("stdio rpath proc exec sendfd unveil", NULL) == -1) + if (pledge("stdio rpath wpath cpath proc exec sendfd unveil", + NULL) == -1) return got_error_from_errno("pledge"); #endif error = gw_apply_unveil(gw_trans->gw_dir->path); @@ -1622,7 +1623,8 @@ gw_tree(struct gw_trans *gw_trans) enum kcgi_err kerr = KCGI_OK; #ifndef PROFILE - if (pledge("stdio rpath proc exec sendfd unveil", NULL) == -1) + if (pledge("stdio rpath wpath cpath proc exec sendfd unveil", + NULL) == -1) return got_error_from_errno("pledge"); #endif if ((header = gw_init_header()) == NULL) @@ -1697,7 +1699,8 @@ gw_tags(struct gw_trans *gw_trans) enum kcgi_err kerr = KCGI_OK; #ifndef PROFILE - if (pledge("stdio rpath proc exec sendfd unveil", NULL) == -1) + if (pledge("stdio rpath wpath cpath proc exec sendfd unveil", + NULL) == -1) return got_error_from_errno("pledge"); #endif if ((header = gw_init_header()) == NULL) @@ -1813,7 +1816,7 @@ gw_tag(struct gw_trans *gw_trans) enum kcgi_err kerr = KCGI_OK; #ifndef PROFILE - if (pledge("stdio rpath proc exec sendfd unveil", NULL) == -1) + if (pledge("stdio rpath wpath cpath proc exec sendfd unveil", NULL) == -1) return got_error_from_errno("pledge"); #endif if ((header = gw_init_header()) == NULL) @@ -2784,6 +2787,7 @@ gw_get_repo_age(char **repo_age, struct gw_trans *gw_t struct got_reflist_head refs; struct got_reflist_entry *re; time_t committer_time = 0, cmp_time = 0; + int *pack_fds = NULL; *repo_age = NULL; TAILQ_INIT(&refs); @@ -2794,7 +2798,10 @@ gw_get_repo_age(char **repo_age, struct gw_trans *gw_t if (gw_trans->repo) repo = gw_trans->repo; else { - error = got_repo_open(&repo, dir, NULL); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_repo_open(&repo, dir, NULL, pack_fds); if (error) return error; } @@ -2844,6 +2851,12 @@ done: if (error == NULL) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } return error; } @@ -2955,15 +2968,20 @@ gw_get_repo_owner(char **owner, struct gw_trans *gw_tr const struct got_error *error = NULL, *close_err; struct got_repository *repo; const char *gitconfig_owner; + int *pack_fds = NULL; *owner = NULL; if (gw_trans->gw_conf->got_show_repo_owner == 0) return NULL; - error = got_repo_open(&repo, dir, NULL); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + return error; + error = got_repo_open(&repo, dir, NULL, pack_fds); if (error) return error; + gitconfig_owner = got_repo_get_gitconfig_owner(repo); if (gitconfig_owner) { *owner = strdup(gitconfig_owner); @@ -2973,6 +2991,12 @@ gw_get_repo_owner(char **owner, struct gw_trans *gw_tr close_err = got_repo_close(repo); if (error == NULL) error = close_err; + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } return error; } @@ -3772,8 +3796,13 @@ gw_get_header(struct gw_trans *gw_trans, struct gw_hea char *in_repo_path = NULL; struct got_object_id *id = NULL; struct got_reference *ref; + int *pack_fds = NULL; - error = got_repo_open(&gw_trans->repo, gw_trans->repo_path, NULL); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_repo_open(&gw_trans->repo, gw_trans->repo_path, NULL, + pack_fds); if (error) return error; @@ -3855,7 +3884,12 @@ gw_get_header(struct gw_trans *gw_trans, struct gw_hea error = gw_get_commits(gw_trans, header, limit, id); done: - got_ref_list_free(&header->refs); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } free(id); free(in_repo_path); return error; @@ -4847,17 +4881,17 @@ main(int argc, char *argv[]) if (error) goto done; - if (gw_trans->action == GW_BLOB) - error = gw_blob(gw_trans); - else - error = gw_display_index(gw_trans); -done: if (gw_trans->repo) { const struct got_error *close_err; close_err = got_repo_close(gw_trans->repo); if (error == NULL) error = close_err; } + if (gw_trans->action == GW_BLOB) + error = gw_blob(gw_trans); + else + error = gw_display_index(gw_trans); +done: if (error) { gw_trans->error = error; gw_trans->action = GW_ERR; blob - b6e44e8b40b8476a471c53fd10cffd4a7ff3b32d blob + dea6dd81d267dfa92571a33f5c7559726bab8d8b --- include/got_repository.h +++ include/got_repository.h @@ -20,7 +20,7 @@ struct got_tag_object; /* Open and close repositories. */ const struct got_error *got_repo_open(struct got_repository**, const char *, - const char *); + const char *, int *); const struct got_error *got_repo_close(struct got_repository*); /* Obtain the on-disk path to the repository. */ @@ -177,3 +177,9 @@ const struct got_error *got_repo_get_loose_object_info /* Obtain the number and size of packed objects in the repository. */ const struct got_error *got_repo_get_packfile_info(int *npackfiles, int *nobjects, off_t *total_packsize, struct got_repository *); + +/* Create an array of file descriptors to hand over to got_repo_open for pack */ +const struct got_error *got_repo_pack_fds_open(int **); + +/* Close the array of file descriptors handed over to got_repo_open for pack */ +const struct got_error *got_repo_pack_fds_close(int *); blob - a35884552cf66d678f0db623e1dd92d976a7014e blob + 414cf45f495487020f948b4b0c3e6a45ef730da9 --- lib/got_lib_worktree.h +++ lib/got_lib_worktree.h @@ -22,6 +22,7 @@ struct got_worktree { struct got_object_id *base_commit_id; char *head_ref_name; uuid_t uuid; + int *pack_fds; /* * File descriptor for the lock file, open while a work tree is open. blob - 5be66db732b6a51d032ae835a233ef3cbcd3733b blob + a43b15276fae6a881257c7e298433f4256b081b0 --- lib/repository.c +++ lib/repository.c @@ -68,6 +68,8 @@ #define nitems(_a) (sizeof(_a) / sizeof((_a)[0])) #endif +#define GOT_PACK_NUM_TEMPFILES GOT_PACK_CACHE_SIZE * 2 + RB_PROTOTYPE(got_packidx_bloom_filter_tree, got_packidx_bloom_filter, entry, got_packidx_bloom_filter_cmp); @@ -247,6 +249,49 @@ done: } const struct got_error * +got_repo_pack_fds_open(int **pack_fds) +{ + const struct got_error *err = NULL; + int i, pack_fds_tmp[GOT_PACK_NUM_TEMPFILES]; + + *pack_fds = calloc(GOT_PACK_NUM_TEMPFILES, sizeof(**pack_fds)); + if (*pack_fds == NULL) + return got_error_from_errno("calloc"); + + for (i = 0; i < GOT_PACK_NUM_TEMPFILES; i++) { + pack_fds_tmp[i] = got_opentempfd(); + if (pack_fds_tmp[i] == -1) { + err = got_repo_pack_fds_close(pack_fds_tmp); + if (err) + return err; + else + return got_error_from_errno("got_opentempfd"); + } + } + memcpy(*pack_fds, pack_fds_tmp, sizeof(pack_fds_tmp)); + return err; +} + +const struct got_error * +got_repo_pack_fds_close(int *pack_fds) +{ + const struct got_error *err = NULL; + int i; + + for (i = 0; i < GOT_PACK_NUM_TEMPFILES; i++) { + if (pack_fds[i] == -1) + continue; + if (close(pack_fds[i]) == -1) { + err = got_error_from_errno("close"); + break; + } + } + free(pack_fds); + pack_fds = NULL; + return err; +} + +const struct got_error * got_repo_cache_object(struct got_repository *repo, struct got_object_id *id, struct got_object *obj) { @@ -651,12 +696,12 @@ static const char *const repo_extensions[] = { const struct got_error * got_repo_open(struct got_repository **repop, const char *path, - const char *global_gitconfig_path) + const char *global_gitconfig_path, int *pack_fds) { struct got_repository *repo = NULL; const struct got_error *err = NULL; char *repo_path = NULL; - size_t i; + size_t i, j = 0; struct rlimit rl; *repop = NULL; @@ -703,12 +748,8 @@ got_repo_open(struct got_repository **repop, const cha repo->pack_cache_size = rl.rlim_cur / 8; for (i = 0; i < nitems(repo->packs); i++) { if (i < repo->pack_cache_size) { - repo->packs[i].basefd = got_opentempfd(); - if (repo->packs[i].basefd == -1) - return got_error_from_errno("got_opentempfd"); - repo->packs[i].accumfd = got_opentempfd(); - if (repo->packs[i].accumfd == -1) - return got_error_from_errno("got_opentempfd"); + repo->packs[i].basefd = pack_fds[j++]; + repo->packs[i].accumfd = pack_fds[j++]; } else { repo->packs[i].basefd = -1; repo->packs[i].accumfd = -1; @@ -796,20 +837,10 @@ got_repo_close(struct got_repository *repo) free(bf); } - for (i = 0; i < repo->pack_cache_size; i++) { + for (i = 0; i < repo->pack_cache_size; i++) if (repo->packs[i].path_packfile) - got_pack_close(&repo->packs[i]); - if (repo->packs[i].basefd != -1) { - if (close(repo->packs[i].basefd) == -1 && err == NULL) - err = got_error_from_errno("close"); - repo->packs[i].basefd = -1; - } - if (repo->packs[i].accumfd != -1) { - if (close(repo->packs[i].accumfd) == -1 && err == NULL) - err = got_error_from_errno("close"); - repo->packs[i].accumfd = -1; - } - } + if (repo->packs[i].path_packfile) + got_pack_close(&repo->packs[i]); free(repo->path); free(repo->path_git_dir); blob - 673cbeb89c705904097774881d38ef9d51751939 blob + 8178c5fa66d216143d6c46befa61dc365b4afe68 --- lib/worktree_open.c +++ lib/worktree_open.c @@ -190,10 +190,15 @@ open_worktree(struct got_worktree **worktree, const ch goto done; } - err = got_repo_open(&repo, (*worktree)->repo_path, NULL); + err = got_repo_pack_fds_open(&(*worktree)->pack_fds); if (err) goto done; + err = got_repo_open(&repo, (*worktree)->repo_path, NULL, + (*worktree)->pack_fds); + if (err) + goto done; + err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo, base_commit_id_str); if (err) @@ -296,6 +301,12 @@ got_worktree_close(struct got_worktree *worktree) if (close(worktree->root_fd) == -1 && err == NULL) err = got_error_from_errno2("close", got_worktree_get_root_path(worktree)); + if (worktree->pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(worktree->pack_fds); + if (err == NULL) + err = pack_err; + } free(worktree->repo_path); free(worktree->path_prefix); free(worktree->base_commit_id); blob - 4f4980303045fa4c780164ca0158522fbc0b9867 blob + 5c47407ceb2960dccae417c6f57f2a5b3f97dc2b --- tog/tog.c +++ tog/tog.c @@ -410,6 +410,7 @@ struct tog_blame { struct tog_blame_thread_args thread_args; struct tog_blame_cb_args cb_args; const char *path; + int *pack_fds; }; struct tog_blame_view_state { @@ -1125,7 +1126,7 @@ view_loop(struct tog_view *view) } TAILQ_INSERT_TAIL(&views, new_view, entry); view = new_view; - } + } if (view) { if (view_is_parent_view(view)) { if (view->child && view->child->focussed) @@ -2317,6 +2318,7 @@ open_log_view(struct tog_view *view, struct got_object struct got_repository *thread_repo = NULL; struct got_commit_graph *thread_graph = NULL; int errcode; + int *pack_fds = NULL; if (in_repo_path != s->in_repo_path) { free(s->in_repo_path); @@ -2370,9 +2372,13 @@ open_log_view(struct tog_view *view, struct got_object view->search_start = search_start_log_view; view->search_next = search_next_log_view; - err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL); + err = got_repo_pack_fds_open(&pack_fds); if (err) goto done; + err = got_repo_open(&thread_repo, got_repo_get_path(repo), NULL, + pack_fds); + if (err) + goto done; err = got_commit_graph_open(&thread_graph, s->in_repo_path, !s->log_branches); if (err) @@ -2407,6 +2413,12 @@ open_log_view(struct tog_view *view, struct got_object s->thread_args.search_next_done = &view->search_next_done; s->thread_args.regex = &view->regex; done: + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (err == NULL) + err = pack_err; + } if (err) close_log_view(view); return err; @@ -2442,6 +2454,7 @@ input_log_view(struct tog_view **new_view, struct tog_ struct tog_view *ref_view = NULL; struct commit_queue_entry *entry; int begin_x = 0, n, nscroll = view->nlines - 1; + int *pack_fds = NULL; if (s->thread_args.load_all) { if (ch == KEY_BACKSPACE) @@ -2640,10 +2653,16 @@ input_log_view(struct tog_view **new_view, struct tog_ } else /* 'B' */ s->log_branches = !s->log_branches; + err = got_repo_pack_fds_open(&pack_fds); + if (err) + return err; err = got_repo_open(&s->thread_args.repo, - got_repo_get_path(s->repo), NULL); + got_repo_get_path(s->repo), NULL, pack_fds); if (err) return err; + err = got_repo_pack_fds_close(pack_fds); + if (err) + return err; tog_free_refs(); err = tog_load_refs(s->repo, 0); if (err) @@ -2797,6 +2816,7 @@ cmd_log(int argc, char *argv[]) const char *head_ref_name = NULL; int ch, log_branches = 0; struct tog_view *view; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "bc:r:")) != -1) { switch (ch) { @@ -2824,6 +2844,10 @@ cmd_log(int argc, char *argv[]) if (argc > 1) usage_log(); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { cwd = getcwd(NULL, 0); if (cwd == NULL) @@ -2842,7 +2866,7 @@ cmd_log(int argc, char *argv[]) } } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error != NULL) goto done; @@ -2914,6 +2938,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } tog_free_refs(); return error; } @@ -3922,6 +3952,7 @@ cmd_diff(int argc, char *argv[]) int ch, force_text_diff = 0; const char *errstr; struct tog_view *view; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "aC:r:w")) != -1) { switch (ch) { @@ -3962,6 +3993,10 @@ cmd_diff(int argc, char *argv[]) } else usage_diff(); + error = got_repo_pack_fds_open(&pack_fds); + if (error) + goto done; + if (repo_path == NULL) { cwd = getcwd(NULL, 0); if (cwd == NULL) @@ -3980,7 +4015,7 @@ cmd_diff(int argc, char *argv[]) } } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error) goto done; @@ -4026,6 +4061,12 @@ done: } if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } tog_free_refs(); return error; } @@ -4345,7 +4386,12 @@ stop_blame(struct tog_blame *blame) } free(blame->cb_args.commit_id); blame->cb_args.commit_id = NULL; - + if (blame->pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(blame->pack_fds); + if (err == NULL) + err = pack_err; + } return err; } @@ -4383,6 +4429,7 @@ run_blame(struct tog_view *view) struct got_repository *thread_repo = NULL; struct got_object_id *obj_id = NULL; int obj_type; + int *pack_fds = NULL; err = got_object_open_as_commit(&commit, s->repo, &s->blamed_commit->id); @@ -4429,10 +4476,15 @@ run_blame(struct tog_view *view) goto done; } - err = got_repo_open(&thread_repo, got_repo_get_path(s->repo), NULL); + err = got_repo_pack_fds_open(&pack_fds); if (err) goto done; + err = got_repo_open(&thread_repo, got_repo_get_path(s->repo), NULL, + pack_fds); + if (err) + goto done; + blame->pack_fds = pack_fds; blame->cb_args.view = view; blame->cb_args.lines = blame->lines; blame->cb_args.nlines = blame->nlines; @@ -4532,7 +4584,6 @@ close_blame_view(struct tog_view *view) free(s->path); free_colors(&s->colors); - return err; } @@ -4874,6 +4925,7 @@ cmd_blame(int argc, char *argv[]) char *commit_id_str = NULL; int ch; struct tog_view *view; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "c:r:")) != -1) { switch (ch) { @@ -4898,6 +4950,10 @@ cmd_blame(int argc, char *argv[]) if (argc != 1) usage_blame(); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { cwd = getcwd(NULL, 0); if (cwd == NULL) @@ -4916,7 +4972,7 @@ cmd_blame(int argc, char *argv[]) } } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error != NULL) goto done; @@ -4990,6 +5046,12 @@ done: if (error == NULL) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } tog_free_refs(); return error; } @@ -5743,6 +5805,7 @@ cmd_tree(int argc, char *argv[]) const char *head_ref_name = NULL; int ch; struct tog_view *view; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "c:r:")) != -1) { switch (ch) { @@ -5767,6 +5830,10 @@ cmd_tree(int argc, char *argv[]) if (argc > 1) usage_tree(); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { cwd = getcwd(NULL, 0); if (cwd == NULL) @@ -5785,7 +5852,7 @@ cmd_tree(int argc, char *argv[]) } } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error != NULL) goto done; @@ -5860,6 +5927,12 @@ done: if (error == NULL) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } tog_free_refs(); return error; } @@ -6503,6 +6576,7 @@ cmd_ref(int argc, char *argv[]) char *cwd = NULL, *repo_path = NULL; int ch; struct tog_view *view; + int *pack_fds = NULL; while ((ch = getopt(argc, argv, "r:")) != -1) { switch (ch) { @@ -6524,6 +6598,10 @@ cmd_ref(int argc, char *argv[]) if (argc > 1) usage_ref(); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + if (repo_path == NULL) { cwd = getcwd(NULL, 0); if (cwd == NULL) @@ -6542,7 +6620,7 @@ cmd_ref(int argc, char *argv[]) } } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error != NULL) goto done; @@ -6580,6 +6658,12 @@ done: if (close_err) error = close_err; } + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } tog_free_refs(); return error; } @@ -6651,11 +6735,16 @@ tog_log_with_path(int argc, char *argv[]) struct got_commit_object *commit = NULL; char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL; char *commit_id_str = NULL, **cmd_argv = NULL; + int *pack_fds = NULL; cwd = getcwd(NULL, 0); if (cwd == NULL) return got_error_from_errno("getcwd"); + error = got_repo_pack_fds_open(&pack_fds); + if (error != NULL) + goto done; + error = got_worktree_open(&worktree, cwd); if (error && error->code != GOT_ERR_NOT_WORKTREE) goto done; @@ -6669,7 +6758,7 @@ tog_log_with_path(int argc, char *argv[]) goto done; } - error = got_repo_open(&repo, repo_path, NULL); + error = got_repo_open(&repo, repo_path, NULL, pack_fds); if (error != NULL) goto done; @@ -6729,6 +6818,12 @@ done: got_object_commit_close(commit); if (worktree) got_worktree_close(worktree); + if (pack_fds) { + const struct got_error *pack_err = + got_repo_pack_fds_close(pack_fds); + if (error == NULL) + error = pack_err; + } free(id); free(commit_id_str); free(commit_id);