79a23c435c
NOTE: This is a binary breaking change as structure sizes have changed size and/or order. - Drop capturing field options, no other options were captured and other mobile targeted languages don't try to capture this sort information (saved 8 bytes for every field defined (in static data and again in field descriptor instance size data). - No longer generate/compile in the messages/enums in descriptor.proto. If developers need it, they should generate it and compile it in. Reduced the overhead of the core library. - Compute the number of has_bits actually needs to avoid over reserving. - Let the boolean single fields store via a has_bit to avoid storage, makes the common cases of the instance size smaller. - Reorder some flags and down size the enums to contain the bits needed. - Reorder the items in the structures to manually ensure they are are packed better (especially when generating 64bit code - 8 bytes for every field, 16 bytes for every extension, instance sizes 8 bytes also). - Split off the structure initialization so when the default is zero, the generated static storage doesn't need to reserve the space. This is batched at the message level, so all the fields for the message have to have zero defaults to get the saves. By definition all proto3 syntax files fall into this case but it also saves space for the proto2 that use the standard defaults. (saves 8 bytes of static data for every field that had a zero default) - Don't track the enums defined by a message. Nothing in the runtime needs it and it was just generation and runtime overhead. (saves 8 bytes per enum) - Ensure EnumDescriptors are started up threadsafe in all cases. - Split some of the Descriptor initialization into multiple methods so the generated code isn't padded with lots of zero/nil args. - Change how oneof info is feed to the runtime enabling us to generate less static data (8 bytes saved per oneof for 64bit). - Change how enum value informat is capture to pack the data and only decode it if it ends up being needed. Avoids padding issues causing bloat of 64bit, and removes the needs for extra pointers in addition to the data (just the data and one pointer now).
125 lines
3.6 KiB
Bash
Executable File
125 lines
3.6 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# Invoked by the Xcode projects to build the protos needed for the unittests.
|
|
|
|
set -eu
|
|
|
|
readonly OUTPUT_DIR="${PROJECT_DERIVED_FILE_DIR}/protos"
|
|
|
|
# Helper for bailing.
|
|
die() {
|
|
echo "Error: $1"
|
|
exit 2
|
|
}
|
|
|
|
# What to do.
|
|
case "${ACTION}" in
|
|
"")
|
|
# Build, fall thru
|
|
;;
|
|
"clean")
|
|
rm -rf "${OUTPUT_DIR}"
|
|
exit 0
|
|
;;
|
|
*)
|
|
die "Unknown action requested: ${ACTION}"
|
|
;;
|
|
esac
|
|
|
|
# Move to the top of the protobuf directories.
|
|
cd "${SRCROOT}/.."
|
|
|
|
[[ -x src/protoc ]] || \
|
|
die "Could not find the protoc binary; make sure you have built it (objectivec/DevTools/full_mac_build.sh -h)."
|
|
|
|
RUN_PROTOC=no
|
|
if [[ ! -d "${OUTPUT_DIR}" ]] ; then
|
|
RUN_PROTOC=yes
|
|
else
|
|
# Find the newest input file (protos, compiler, and this script).
|
|
# (these patterns catch some extra stuff, but better to over sample than
|
|
# under)
|
|
readonly NewestInput=$(find \
|
|
src/google/protobuf/*.proto \
|
|
objectivec/Tests/*.proto \
|
|
src/.libs src/*.la src/protoc \
|
|
objectivec/DevTools/compile_testing_protos.sh \
|
|
-type f -print0 \
|
|
| xargs -0 stat -f "%m %N" \
|
|
| sort -n | tail -n1 | cut -f2- -d" ")
|
|
# Find the oldest output file.
|
|
readonly OldestOutput=$(find \
|
|
"${OUTPUT_DIR}" \
|
|
-type f -print0 \
|
|
| xargs -0 stat -f "%m %N" \
|
|
| sort -n -r | tail -n1 | cut -f2- -d" ")
|
|
# If the newest input is newer than the oldest output, regenerate.
|
|
if [[ "${NewestInput}" -nt "${OldestOutput}" ]] ; then
|
|
RUN_PROTOC=yes
|
|
fi
|
|
fi
|
|
|
|
if [[ "${RUN_PROTOC}" != "yes" ]] ; then
|
|
# Up to date.
|
|
exit 0
|
|
fi
|
|
|
|
# Ensure the output dir exists
|
|
mkdir -p "${OUTPUT_DIR}/google/protobuf"
|
|
|
|
CORE_PROTO_FILES=(
|
|
src/google/protobuf/unittest_arena.proto
|
|
src/google/protobuf/unittest_custom_options.proto
|
|
src/google/protobuf/unittest_enormous_descriptor.proto
|
|
src/google/protobuf/unittest_embed_optimize_for.proto
|
|
src/google/protobuf/unittest_empty.proto
|
|
src/google/protobuf/unittest_import.proto
|
|
src/google/protobuf/unittest_import_lite.proto
|
|
src/google/protobuf/unittest_lite.proto
|
|
src/google/protobuf/unittest_mset.proto
|
|
src/google/protobuf/unittest_mset_wire_format.proto
|
|
src/google/protobuf/unittest_no_arena.proto
|
|
src/google/protobuf/unittest_no_arena_import.proto
|
|
src/google/protobuf/unittest_no_generic_services.proto
|
|
src/google/protobuf/unittest_optimize_for.proto
|
|
src/google/protobuf/unittest.proto
|
|
src/google/protobuf/unittest_import_public.proto
|
|
src/google/protobuf/unittest_import_public_lite.proto
|
|
src/google/protobuf/unittest_drop_unknown_fields.proto
|
|
src/google/protobuf/unittest_preserve_unknown_enum.proto
|
|
src/google/protobuf/map_lite_unittest.proto
|
|
src/google/protobuf/map_proto2_unittest.proto
|
|
src/google/protobuf/map_unittest.proto
|
|
)
|
|
|
|
# The unittest_custom_options.proto extends the messages in descriptor.proto
|
|
# so we build it in to test extending in general. The library doesn't provide
|
|
# a descriptor as it doesn't use the classes/enums.
|
|
CORE_PROTO_FILES+=(
|
|
src/google/protobuf/descriptor.proto
|
|
)
|
|
|
|
compile_proto() {
|
|
src/protoc \
|
|
--objc_out="${OUTPUT_DIR}/google/protobuf" \
|
|
--proto_path=src/google/protobuf/ \
|
|
--proto_path=src \
|
|
$*
|
|
}
|
|
|
|
for a_proto in "${CORE_PROTO_FILES[@]}" ; do
|
|
compile_proto "${a_proto}"
|
|
done
|
|
|
|
OBJC_PROTO_FILES=(
|
|
objectivec/Tests/unittest_cycle.proto
|
|
objectivec/Tests/unittest_runtime_proto2.proto
|
|
objectivec/Tests/unittest_runtime_proto3.proto
|
|
objectivec/Tests/unittest_objc.proto
|
|
objectivec/Tests/unittest_objc_startup.proto
|
|
)
|
|
|
|
for a_proto in "${OBJC_PROTO_FILES[@]}" ; do
|
|
compile_proto --proto_path="objectivec/Tests" "${a_proto}"
|
|
done
|