Repeated refactoring.

eerimoq · Jan 15, 2020 · c2fcab0 · c2fcab0
1 parent c9f7343
commit c2fcab0
Show file tree

Hide file tree

Showing 99 changed files with 686 additions and 587 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,9 +11,7 @@ install:
 script:
   - coverage run --source=pbtools setup.py test
   - make test-c
-  - make -C examples/c/hello_world
-  - make -C examples/c/address_book
-  - make -C examples/c/oneof
+  - make -C examples/c
   - make -C benchmark ITERATIONS=1
 
 after_success:

diff --git a/Makefile b/Makefile
@@ -66,3 +66,7 @@ release-to-pypi:
 	python setup.py sdist
 	python setup.py bdist_wheel --universal
 	twine upload dist/*
+
+generate:
+	$(MAKE) -C examples/c generate
+	$(MAKE) -C benchmark/pbtools generate
diff --git a/benchmark/pbtools/Makefile b/benchmark/pbtools/Makefile
@@ -24,4 +24,8 @@ all:
 	time ./main-speed-lto encode $(ITERATIONS)
 	time ./main-speed-lto decode $(ITERATIONS)
 
+generate:
+	env PYTHONPATH=../.. \
+	    python3 -m pbtools generate_c_source ../benchmark.proto
+
 include ../common.mk
diff --git a/benchmark/pbtools/benchmark.c b/benchmark/pbtools/benchmark.c
@@ -168,13 +168,13 @@ void benchmark_sub_message_encode_repeated_inner(
 }
 
 void benchmark_sub_message_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct benchmark_sub_message_repeated_t *repeated_p)
 {
     pbtools_decode_repeated_inner(
-        repeated_info_p,
         decoder_p,
+        repeated_info_p,
         (struct pbtools_repeated_message_t *)repeated_p,
         sizeof(struct benchmark_sub_message_t),
         (pbtools_message_init_t)benchmark_sub_message_init,
@@ -283,7 +283,7 @@ void benchmark_message1_decode_inner(
     int wire_type;
     struct pbtools_repeated_info_t repeated_info_field4;
 
-    pbtools_repeated_info_init(&repeated_info_field4, 4, decoder_p);
+    pbtools_repeated_info_init(&repeated_info_field4, 4);
 
     while (pbtools_decoder_available(decoder_p)) {
         switch (pbtools_decoder_read_tag(decoder_p, &wire_type)) {
@@ -415,13 +415,13 @@ void benchmark_message1_encode_repeated_inner(
 }
 
 void benchmark_message1_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct benchmark_message1_repeated_t *repeated_p)
 {
     pbtools_decode_repeated_inner(
-        repeated_info_p,
         decoder_p,
+        repeated_info_p,
         (struct pbtools_repeated_message_t *)repeated_p,
         sizeof(struct benchmark_message1_t),
         (pbtools_message_init_t)benchmark_message1_init,
@@ -543,13 +543,13 @@ void benchmark_message2_encode_repeated_inner(
 }
 
 void benchmark_message2_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct benchmark_message2_repeated_t *repeated_p)
 {
     pbtools_decode_repeated_inner(
-        repeated_info_p,
         decoder_p,
+        repeated_info_p,
         (struct pbtools_repeated_message_t *)repeated_p,
         sizeof(struct benchmark_message2_t),
         (pbtools_message_init_t)benchmark_message2_init,
@@ -665,13 +665,13 @@ void benchmark_message3_sub_message_encode_repeated_inner(
 }
 
 void benchmark_message3_sub_message_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct benchmark_message3_sub_message_repeated_t *repeated_p)
 {
     pbtools_decode_repeated_inner(
-        repeated_info_p,
         decoder_p,
+        repeated_info_p,
         (struct pbtools_repeated_message_t *)repeated_p,
         sizeof(struct benchmark_message3_sub_message_t),
         (pbtools_message_init_t)benchmark_message3_sub_message_init,
@@ -703,7 +703,7 @@ void benchmark_message3_decode_inner(
     int wire_type;
     struct pbtools_repeated_info_t repeated_info_field13;
 
-    pbtools_repeated_info_init(&repeated_info_field13, 13, decoder_p);
+    pbtools_repeated_info_init(&repeated_info_field13, 13);
 
     while (pbtools_decoder_available(decoder_p)) {
         switch (pbtools_decoder_read_tag(decoder_p, &wire_type)) {
@@ -721,8 +721,8 @@ void benchmark_message3_decode_inner(
     }
 
     benchmark_message3_sub_message_decode_repeated_inner(
-        &repeated_info_field13,
         decoder_p,
+        &repeated_info_field13,
         &self_p->field13);
 }
 
@@ -752,13 +752,13 @@ void benchmark_message3_encode_repeated_inner(
 }
 
 void benchmark_message3_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct benchmark_message3_repeated_t *repeated_p)
 {
     pbtools_decode_repeated_inner(
-        repeated_info_p,
         decoder_p,
+        repeated_info_p,
         (struct pbtools_repeated_message_t *)repeated_p,
         sizeof(struct benchmark_message3_t),
         (pbtools_message_init_t)benchmark_message3_init,
@@ -968,13 +968,13 @@ void benchmark_message_encode_repeated_inner(
 }
 
 void benchmark_message_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct benchmark_message_repeated_t *repeated_p)
 {
     pbtools_decode_repeated_inner(
-        repeated_info_p,
         decoder_p,
+        repeated_info_p,
         (struct pbtools_repeated_message_t *)repeated_p,
         sizeof(struct benchmark_message_t),
         (pbtools_message_init_t)benchmark_message_init,

diff --git a/benchmark/pbtools/benchmark.h b/benchmark/pbtools/benchmark.h
@@ -318,8 +318,8 @@ void benchmark_sub_message_encode_repeated_inner(
     struct benchmark_sub_message_repeated_t *repeated_p);
 
 void benchmark_sub_message_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct benchmark_sub_message_repeated_t *repeated_p);
 
 void benchmark_message1_init(
@@ -340,8 +340,8 @@ void benchmark_message1_encode_repeated_inner(
     struct benchmark_message1_repeated_t *repeated_p);
 
 void benchmark_message1_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct benchmark_message1_repeated_t *repeated_p);
 
 void benchmark_message2_init(
@@ -362,8 +362,8 @@ void benchmark_message2_encode_repeated_inner(
     struct benchmark_message2_repeated_t *repeated_p);
 
 void benchmark_message2_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct benchmark_message2_repeated_t *repeated_p);
 
 void benchmark_message3_init(
@@ -384,8 +384,8 @@ void benchmark_message3_encode_repeated_inner(
     struct benchmark_message3_repeated_t *repeated_p);
 
 void benchmark_message3_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct benchmark_message3_repeated_t *repeated_p);
 
 void benchmark_message3_sub_message_init(
@@ -406,8 +406,8 @@ void benchmark_message3_sub_message_encode_repeated_inner(
     struct benchmark_message3_sub_message_repeated_t *repeated_p);
 
 void benchmark_message3_sub_message_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct benchmark_message3_sub_message_repeated_t *repeated_p);
 
 void benchmark_message_init(
@@ -428,8 +428,8 @@ void benchmark_message_encode_repeated_inner(
     struct benchmark_message_repeated_t *repeated_p);
 
 void benchmark_message_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct benchmark_message_repeated_t *repeated_p);
 
 #ifdef __cplusplus

diff --git a/examples/c/Makefile b/examples/c/Makefile
@@ -0,0 +1,11 @@
+all:
+	$(MAKE) -C address_book
+	$(MAKE) -C hello_world
+	$(MAKE) -C oneof
+	$(MAKE) -C repeated
+
+generate:
+	$(MAKE) -C address_book generate
+	$(MAKE) -C hello_world generate
+	$(MAKE) -C oneof generate
+	$(MAKE) -C repeated generate
diff --git a/examples/c/address_book/generated/address_book.c b/examples/c/address_book/generated/address_book.c
@@ -90,13 +90,13 @@ void address_book_person_phone_number_encode_repeated_inner(
 }
 
 void address_book_person_phone_number_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct address_book_person_phone_number_repeated_t *repeated_p)
 {
     pbtools_decode_repeated_inner(
-        repeated_info_p,
         decoder_p,
+        repeated_info_p,
         (struct pbtools_repeated_message_t *)repeated_p,
         sizeof(struct address_book_person_phone_number_t),
         (pbtools_message_init_t)address_book_person_phone_number_init,
@@ -134,7 +134,7 @@ void address_book_person_decode_inner(
     int wire_type;
     struct pbtools_repeated_info_t repeated_info_phones;
 
-    pbtools_repeated_info_init(&repeated_info_phones, 4, decoder_p);
+    pbtools_repeated_info_init(&repeated_info_phones, 4);
 
     while (pbtools_decoder_available(decoder_p)) {
         switch (pbtools_decoder_read_tag(decoder_p, &wire_type)) {
@@ -164,8 +164,8 @@ void address_book_person_decode_inner(
     }
 
     address_book_person_phone_number_decode_repeated_inner(
-        &repeated_info_phones,
         decoder_p,
+        &repeated_info_phones,
         &self_p->phones);
 }
 
@@ -195,13 +195,13 @@ void address_book_person_encode_repeated_inner(
 }
 
 void address_book_person_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct address_book_person_repeated_t *repeated_p)
 {
     pbtools_decode_repeated_inner(
-        repeated_info_p,
         decoder_p,
+        repeated_info_p,
         (struct pbtools_repeated_message_t *)repeated_p,
         sizeof(struct address_book_person_t),
         (pbtools_message_init_t)address_book_person_init,
@@ -269,7 +269,7 @@ void address_book_address_book_decode_inner(
     int wire_type;
     struct pbtools_repeated_info_t repeated_info_people;
 
-    pbtools_repeated_info_init(&repeated_info_people, 1, decoder_p);
+    pbtools_repeated_info_init(&repeated_info_people, 1);
 
     while (pbtools_decoder_available(decoder_p)) {
         switch (pbtools_decoder_read_tag(decoder_p, &wire_type)) {
@@ -287,8 +287,8 @@ void address_book_address_book_decode_inner(
     }
 
     address_book_person_decode_repeated_inner(
-        &repeated_info_people,
         decoder_p,
+        &repeated_info_people,
         &self_p->people);
 }
 
@@ -318,13 +318,13 @@ void address_book_address_book_encode_repeated_inner(
 }
 
 void address_book_address_book_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct address_book_address_book_repeated_t *repeated_p)
 {
     pbtools_decode_repeated_inner(
-        repeated_info_p,
         decoder_p,
+        repeated_info_p,
         (struct pbtools_repeated_message_t *)repeated_p,
         sizeof(struct address_book_address_book_t),
         (pbtools_message_init_t)address_book_address_book_init,

diff --git a/examples/c/address_book/generated/address_book.h b/examples/c/address_book/generated/address_book.h
@@ -153,8 +153,8 @@ void address_book_person_encode_repeated_inner(
     struct address_book_person_repeated_t *repeated_p);
 
 void address_book_person_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct address_book_person_repeated_t *repeated_p);
 
 void address_book_person_phone_number_init(
@@ -175,8 +175,8 @@ void address_book_person_phone_number_encode_repeated_inner(
     struct address_book_person_phone_number_repeated_t *repeated_p);
 
 void address_book_person_phone_number_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct address_book_person_phone_number_repeated_t *repeated_p);
 
 void address_book_address_book_init(
@@ -197,8 +197,8 @@ void address_book_address_book_encode_repeated_inner(
     struct address_book_address_book_repeated_t *repeated_p);
 
 void address_book_address_book_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct address_book_address_book_repeated_t *repeated_p);
 
 #ifdef __cplusplus

diff --git a/examples/c/hello_world/generated/hello_world.c b/examples/c/hello_world/generated/hello_world.c
@@ -84,13 +84,13 @@ void hello_world_foo_encode_repeated_inner(
 }
 
 void hello_world_foo_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct hello_world_foo_repeated_t *repeated_p)
 {
     pbtools_decode_repeated_inner(
-        repeated_info_p,
         decoder_p,
+        repeated_info_p,
         (struct pbtools_repeated_message_t *)repeated_p,
         sizeof(struct hello_world_foo_t),
         (pbtools_message_init_t)hello_world_foo_init,

diff --git a/examples/c/hello_world/generated/hello_world.h b/examples/c/hello_world/generated/hello_world.h
@@ -88,8 +88,8 @@ void hello_world_foo_encode_repeated_inner(
     struct hello_world_foo_repeated_t *repeated_p);
 
 void hello_world_foo_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct hello_world_foo_repeated_t *repeated_p);
 
 #ifdef __cplusplus

diff --git a/examples/c/oneof/generated/oneof.c b/examples/c/oneof/generated/oneof.c
@@ -155,13 +155,13 @@ void oneof_foo_encode_repeated_inner(
 }
 
 void oneof_foo_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct oneof_foo_repeated_t *repeated_p)
 {
     pbtools_decode_repeated_inner(
-        repeated_info_p,
         decoder_p,
+        repeated_info_p,
         (struct pbtools_repeated_message_t *)repeated_p,
         sizeof(struct oneof_foo_t),
         (pbtools_message_init_t)oneof_foo_init,

diff --git a/examples/c/oneof/generated/oneof.h b/examples/c/oneof/generated/oneof.h
@@ -114,8 +114,8 @@ void oneof_foo_encode_repeated_inner(
     struct oneof_foo_repeated_t *repeated_p);
 
 void oneof_foo_decode_repeated_inner(
-    struct pbtools_repeated_info_t *repeated_info_p,
     struct pbtools_decoder_t *decoder_p,
+    struct pbtools_repeated_info_t *repeated_info_p,
     struct oneof_foo_repeated_t *repeated_p);
 
 #ifdef __cplusplus