| Message ID | pull.922.git.git.1606245012068.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a76b138daa1696129c029309b3c0d49d72ff6b19 |
| Headers | show |
| Series | move sleep_millisec to git-compat-util.h | expand |
"Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Han-Wen Nienhuys <hanwen@google.com> > > The sleep function is defined in wrapper.c, so it makes more sense to be a in > system compatibility header. > > Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> > --- > move sleep_millisec to git-compat-util.h Makes sense.
On November 24, 2020 4:51 PM, Junio C Hamano wrote: > To: Han-Wen Nienhuys via GitGitGadget <gitgitgadget@gmail.com> > Cc: git@vger.kernel.org; Han-Wen Nienhuys <hanwenn@gmail.com>; Han- > Wen Nienhuys <hanwen@google.com> > Subject: Re: [PATCH] move sleep_millisec to git-compat-util.h > > "Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com> writes: > > > From: Han-Wen Nienhuys <hanwen@google.com> > > > > The sleep function is defined in wrapper.c, so it makes more sense to > > be a in system compatibility header. > > > > Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> > > --- > > move sleep_millisec to git-compat-util.h > > Makes sense. I have a platform fix that I'd like to apply once this makes it into the main code. The sleep_millisec uses poll(), which is rather heavy-weight on the NonStop platform. We have a much more efficient sleep function available (with microsecond resolution), which would be more useful unless there is a poll side-effect on which git depends. Would this be acceptable? I could push this at any time really. index bcda41e374..972ecd67bf 100644 --- a/wrapper.c +++ b/wrapper.c @@ -4,6 +4,10 @@ #include "cache.h" #include "config.h" +#ifdef __TANDEM +#include <cextdecs> /* for PROCESS_DELAY_ */ +#endif + static int memory_limit_check(size_t size, int gentle) { static size_t limit = 0; @@ -650,7 +654,11 @@ void write_file(const char *path, const char *fmt, ...) void sleep_millisec(int millisec) { +#ifdef __TANDEM + PROCESS_DELAY_(millisec * 1000LL); +#else poll(NULL, 0, millisec); +#endif } int xgethostname(char *buf, size_t len) Regards, Randall
"Randall S. Becker" <rsbecker@nexbridge.com> writes: > I have a platform fix that I'd like to apply once this makes it into the > main code. The sleep_millisec uses poll(), which is rather heavy-weight on > the NonStop platform. We have a much more efficient sleep function available > (with microsecond resolution), which would be more useful unless there is a > poll side-effect on which git depends. Would this be acceptable? I could > push this at any time really. We strongly prefer not to contaminate generic part of source with platform specific conditional compilation. If this were a much larger helper function, it might make sense to perform the compat/*.c dance, but in this case: * [PATCH 1/2] that implements sleep_millisec() in git-compat-util.h as a static inline function; and then * [PATCH 2/2] that does the equivalent of your patch below, but in git-compat-util.h might be the cleanest. > index bcda41e374..972ecd67bf 100644 > --- a/wrapper.c > +++ b/wrapper.c > @@ -4,6 +4,10 @@ > #include "cache.h" > #include "config.h" > > +#ifdef __TANDEM > +#include <cextdecs> /* for PROCESS_DELAY_ */ > +#endif > + > static int memory_limit_check(size_t size, int gentle) > { > static size_t limit = 0; > @@ -650,7 +654,11 @@ void write_file(const char *path, const char *fmt, ...) > > void sleep_millisec(int millisec) > { > +#ifdef __TANDEM > + PROCESS_DELAY_(millisec * 1000LL); > +#else > poll(NULL, 0, millisec); > +#endif > } > > int xgethostname(char *buf, size_t len) > > Regards, > Randall
On November 24, 2020 10:12 PM, Junio C Hamano wrote: > "Randall S. Becker" <rsbecker@nexbridge.com> writes: > > I have a platform fix that I'd like to apply once this makes it into > > the main code. The sleep_millisec uses poll(), which is rather > > heavy-weight on the NonStop platform. We have a much more efficient > > sleep function available (with microsecond resolution), which would be > > more useful unless there is a poll side-effect on which git depends. > > Would this be acceptable? I could push this at any time really. > > We strongly prefer not to contaminate generic part of source with platform > specific conditional compilation. > > If this were a much larger helper function, it might make sense to perform > the compat/*.c dance, but in this case: > > * [PATCH 1/2] that implements sleep_millisec() in git-compat-util.h > as a static inline function; and then > > * [PATCH 2/2] that does the equivalent of your patch below, but in > git-compat-util.h > > might be the cleanest. > > > index bcda41e374..972ecd67bf 100644 > > --- a/wrapper.c > > +++ b/wrapper.c > > @@ -4,6 +4,10 @@ > > #include "cache.h" > > #include "config.h" > > > > +#ifdef __TANDEM > > +#include <cextdecs> /* for PROCESS_DELAY_ */ #endif > > + > > static int memory_limit_check(size_t size, int gentle) { > > static size_t limit = 0; > > @@ -650,7 +654,11 @@ void write_file(const char *path, const char > > *fmt, ...) > > > > void sleep_millisec(int millisec) > > { > > +#ifdef __TANDEM > > + PROCESS_DELAY_(millisec * 1000LL); #else > > poll(NULL, 0, millisec); > > +#endif > > } > > > > int xgethostname(char *buf, size_t len) I just chatted with my team and we think that sticking with the existing poll call is probably better in the long term. We are planning to try to get git to work using PUT threads - but that is a longer project for a whole slew of reasons. It involves pulling all or most of the FLOSS stuff out, or making that configurable to use FLOSS when not using threads and not using FLOSS when using threads. It might be useful, however, to use usleep() instead of poll(NULL) when threading is used on most platforms as it is a more effective way of context switching between threads than select(). Regards, Randall
"Randall S. Becker" <rsbecker@nexbridge.com> writes: > I just chatted with my team and we think that sticking with the existing > poll call is probably better in the long term. We are planning to try to get > git to work using PUT threads - but that is a longer project for a whole > slew of reasons. It involves pulling all or most of the FLOSS stuff out, or > making that configurable to use FLOSS when not using threads and not using > FLOSS when using threads. It might be useful, however, to use usleep() > instead of poll(NULL) when threading is used on most platforms as it is a > more effective way of context switching between threads than select(). Yeah, if usleep() is portable enough, that would probably be the ideal direction to go.
diff --git a/cache.h b/cache.h index c0072d43b1..e986cf4ea9 100644 --- a/cache.h +++ b/cache.h @@ -1960,7 +1960,6 @@ int stat_validity_check(struct stat_validity *sv, const char *path); void stat_validity_update(struct stat_validity *sv, int fd); int versioncmp(const char *s1, const char *s2); -void sleep_millisec(int millisec); /* * Create a directory and (if share is nonzero) adjust its permissions diff --git a/git-compat-util.h b/git-compat-util.h index adfea06897..7d509c5022 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -1354,4 +1354,6 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset) ((uintptr_t)&(ptr)->member - (uintptr_t)(ptr)) #endif /* !__GNUC__ */ +void sleep_millisec(int millisec); + #endif