path: root/transport.h
diff options
authorShawn O. Pearce <>2007-09-19 04:49:31 (GMT)
committerJunio C Hamano <>2007-09-19 10:22:31 (GMT)
commit824d5776c3f275c644c71b8c7e254bd2d7b08071 (patch)
treea890e276fc45eafdaf55f97dbace327a96448fc3 /transport.h
parent28b91f8ad9e4791b5c35ca6bffbb78725b4e5bbf (diff)
Refactor struct transport_ops inlined into struct transport
Aside from reducing the code by 20 lines this refactoring removes a level of indirection when trying to access the operations of a given transport "instance", making the code clearer and easier to follow. It also has the nice effect of giving us the benefits of C99 style struct initialization (namely ".fetch = X") without requiring that level of language support from our compiler. We don't need to worry about new operation methods being added as they will now be NULL'd out automatically by the xcalloc() we use to create the new struct transport we supply to the caller. This pattern already exists in struct walker, so we already have a precedent for it in Git. We also don't really need to worry about any sort of performance decreases that may occur as a result of filling out 4-8 op pointers when we make a "struct transport". The extra few CPU cycles this requires over filling in the "struct transport_ops" is killed by the time it will take Git to actually *use* one of those functions, as most transport operations are going over the wire or will be copying object data locally between two directories. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'transport.h')
1 files changed, 5 insertions, 11 deletions
diff --git a/transport.h b/transport.h
index 6a95d66..3e332ff 100644
--- a/transport.h
+++ b/transport.h
@@ -5,22 +5,11 @@
#include "remote.h"
struct transport {
- unsigned verbose : 1;
struct remote *remote;
const char *url;
void *data;
struct ref *remote_refs;
- const struct transport_ops *ops;
- char *pack_lockfile;
-struct transport_ops {
* Returns 0 if successful, positive if the option is not
* recognized or is inapplicable, and negative if the option
@@ -34,8 +23,13 @@ struct transport_ops {
int (*push)(struct transport *connection, int refspec_nr, const char **refspec, int flags);
int (*disconnect)(struct transport *connection);
+ char *pack_lockfile;
+ unsigned verbose : 1;
/* Returns a transport suitable for the url */
struct transport *transport_get(struct remote *, const char *);