296 Commits

Author SHA1 Message Date
Kevin Lyda
f52f500995 Autoconf portability tweaks.
Use MKDIR_P and LN_S rather than their usual expansions.
2014-01-25 15:56:40 +00:00
Robert Edmonds
ed036b769f Revert "protobuf-c/libprotobuf-c.sym: new" (fixes #116)
This reverts commit aaa40c5881f12877cca63c06a798d8422f9470de.
2014-01-17 11:10:39 -05:00
Robert Edmonds
447964eee4 .travis.yml: add back "language: c"
of course, protobuf-c uses both C and C++.
2014-01-14 13:52:21 -05:00
Robert Edmonds
28e70e5e9a .travis.yml: remove "make clean" at end of build script 2014-01-14 13:51:30 -05:00
Robert Edmonds
dd0f0ea3ef Makefile.am: AM_TESTS_ENVIRONMENT -> LOG_COMPILER
It’s important to note that, differently from what we’ve seen for
    the serial test harness (see Parallel Test Harness), the
    AM_TESTS_ENVIRONMENT and TESTS_ENVIRONMENT variables cannot be use
    to define a custom test runner; the LOG_COMPILER and LOG_FLAGS (or
    their extension-specific counterparts) should be used instead:

    ## This is WRONG!
    AM_TESTS_ENVIRONMENT = PERL5LIB='$(srcdir)/lib' $(PERL) -Mstrict -w

    ## Do this instead.
    AM_TESTS_ENVIRONMENT = PERL5LIB='$(srcdir)/lib'; export PERL5LIB;
    LOG_COMPILER = $(PERL)
    AM_LOG_FLAGS = -Mstrict -w

(http://www.gnu.org/software/automake/manual/html_node/Parallel-Test-Harness.html)
2014-01-14 13:46:19 -05:00
Robert Edmonds
bfd88382e6 .travis.yml: add VERBOSE=1 to make flags in order to log test failures
"As with the serial harness above, by default one status line is printed
per completed test, and a short summary after the suite has completed.
However, standard output and standard error of the test are redirected
to a per-test log file, so that parallel execution does not produce
intermingled output. The output from failed tests is collected in the
test-suite.log file. If the variable ‘VERBOSE’ is set, this file is
output after the summary."

(http://www.gnu.org/software/automake/manual/html_node/Parallel-Test-Harness.html)
2014-01-14 13:39:33 -05:00
Ilya Lipnitskiy
d74ef06435 .travis.yml: install valgrind on the CI VM 2014-01-14 00:20:05 -08:00
Ilya Lipnitskiy
baa3ab296d .travis.yml: add a travis build entry to run tests under valgrind
Makefile.am: add valgrind to the AM_TESTS_ENVIRONMENT
configure.ac: enable valgrind testing option for ./configure
m4/valgrind-tests.m4: enable tracing children for libtool wrapper
script compatibility, but ignore standard binaries in /usr or /bin
2014-01-14 00:20:05 -08:00
Ilya Lipnitskiy
2b371c154f m4/valgrind-tests.m4: add valgrind testing support to automake 2014-01-14 00:19:24 -08:00
Robert Edmonds
847091c86e ChangeLog: mention google compat symlink and protobuf-c-rpc splitout 2014-01-13 21:55:43 -05:00
Robert Edmonds
d10a022eb4 ChangeLog: configure --disable-protoc has been restored 2014-01-13 21:51:50 -05:00
Robert Edmonds
6f0237a6c6 ChangeLog: the entries about the rpc code have been moved to protobuf-c-rpc's ChangeLog 2014-01-13 21:51:14 -05:00
Robert Edmonds
caff46e1f6 make .alloc and .free methods of ProtobufCAllocator callable again
it turned out to be a bad idea to not export the default allocator's
methods via the ProtobufCAllocator's function pointers. there is at
least one user (protobuf-c-rpc) that makes allocations by directly
invoking those methods.
2014-01-13 21:47:28 -05:00
Robert Edmonds
aaa40c5881 protobuf-c/libprotobuf-c.sym: new
use a linker script rather than relying on libtool's
-export-symbols-regex. this lets us start versioning the library's
exported symbols.
2014-01-13 20:17:39 -05:00
Robert Edmonds
606c27b411 protobuf-c: update #include comments
in particular we no longer use abort().
2014-01-13 19:53:41 -05:00
Robert Edmonds
e8bf07dee0 protobuf-c: just use <stdint.h>
according to microsoft's platform evangelist, "we recommend that you
consider using a different compiler such as Intel or gcc" if you need a
conforming C compiler. since there's already a project that maintains
the stdint.h / inttypes.h headers for microsoft compilers
(https://code.google.com/p/msinttypes/) there's not much point in
maintaining this ourselves.
2014-01-13 19:53:41 -05:00
Robert Edmonds
677c3f0bdf remove protobuf-c-private.h
there's not much point to having the "private" definitions split out
into a separate header file. they're still in the namespace and there's
nothing that can be done to prevent "unauthorized" uses. just integrate
the definitions into the main header file but put them in the bottom and
note that they're "private".

this makes it very slightly easier to copy the protobuf-c support
library into another project wholesale, since one less file is required.
2014-01-13 19:53:41 -05:00
Robert Edmonds
85847c494e protobuf-c: remove PROTOBUF_C_PLEASE_INCLUDE_CTYPE, ProtobufC_CType
i'm not quite sure what this thing is used for or how useful it could
possibly be. it's not used anywhere in protobuf-c or protobuf-c-rpc, and
it wasn't in protobuf-c 0.14 or earlier. just delete it; if anything
actually needs this kind of logic, it's easy enough to replicate it.
2014-01-13 19:53:41 -05:00
Robert Edmonds
f6cee05cf0 protobuf-c: make it a bit harder to generate output to stdio
libraries should never generate output on their own to stdout/stderr.
remove the PRINT_UNPACK_ERRORS macro and rename UNPACK_ERROR to
PROTOBUF_C_UNPACK_ERROR.

the error strings are left in but compiled out by default. they could
theoretically be re-enabled for a debugging session by changing the
PROTOBUF_C_UNPACK_ERROR macro to something like:

	#define PROTOBUF_C_UNPACK_ERROR(...) do { fprintf(stderr, __VA_ARGS__); fputc('\n', stderr); } while (0)
2014-01-13 19:53:41 -05:00
Robert Edmonds
b1a2c06140 protobuf-c: add some whitespace to TRUE, FALSE defines 2014-01-13 19:53:41 -05:00
Robert Edmonds
5a026769e6 Makefile.am: set up a compatibility symlink for include paths that use <google/protobuf-c>
it might be premature to remove the <google/> prefix from the include
path. set up a compatibility symlink so that old code continues to
compile.
2014-01-13 19:53:41 -05:00
Robert Edmonds
a2fb294a22 build system: add back the --disable-protoc option to configure 2014-01-13 19:53:41 -05:00
Robert Edmonds
4c7904fc13 configure.ac: remove the AC_CHECK_HEADERS checks
some of these headers aren't used in the protobuf-c code base any more,
and in any case the results of these checks (the HAVE_*_H defines in
config.h) are not actually used anywhere and the absence of any of these
headers doesn't cause configure to fail, so just delete these useless
checks.
2014-01-13 19:53:41 -05:00
Robert Edmonds
09b801a968 protobuf-c: replace DO_ALLOC, FREE, system_alloc, system_free with inline memory allocation functions
this reworks memory allocation throughout the support library.

the old DO_ALLOC macro had several problems:

  1) only by reading the macro implementation is it possible to tell
  what actually occurs. consider:

        DO_ALLOC(x, ...);

  vs.:

        x = do_alloc(...);

  only in the latter is it clear that x is being assigned to.

  2) it looks like a typical macro/function call, except it alters the
  control flow, usually by return'ing or executing a goto in the
  enclosing function. this type of anti-pattern is explicitly called out
  in the linux kernel coding style.

  3) in one instance, setting the destination pointer to NULL is
  actually a *success* return. in parse_required_member(), when parsing
  a PROTOBUF_C_TYPE_BYTES wire field, it is possible that the field is
  present but of zero length, in which case memory shouldn't be
  allocated and nothing should actually be copied. this is not apparent
  from reading:

        DO_ALLOC(bd->data, allocator, len - pref_len, return 0);
        memcpy(bd->data, data + pref_len, len - pref_len);

  instead, make this behavior explicit:

        if (len - pref_len > 0) {
                bd->data = do_alloc(allocator, len - pref_len);
                if (bd->data == NULL)
                        return 0;
                memcpy(bd->data, data + pref_len, len - pref_len);
        }

  this is much more readable and makes it possible to write a
  replacement for DO_ALLOC which returns NULL on failures.

this changes the protobuf_c_default_allocator to contain only NULL
values; if a replacement function pointer is not present (non-NULL) in
this struct, the default malloc/free implementations are used. this
makes it impossible to call the default allocator functions directly and
represents an API/ABI break, which required a fix to the
PROTOBUF_C_BUFFER_SIMPLE_CLEAR macro.

despite turning one-line allocations in the simple case:

	DO_ALLOC(rv, allocator, desc->sizeof_message, return NULL);

into three-line statements like:

	rv = do_alloc(allocator, desc->sizeof_message);
	if (!rv)
		return (NULL);

this changeset actually *reduces* the total number of lines in the
support library.
2014-01-13 19:53:41 -05:00
Robert Edmonds
8216865a46 protobuf-c: remove alloc_failed_warning and protobuf_c_out_of_memory
in general, libraries shouldn't be responsible for terminating the
program if memory allocation fails. if we need to allocate memory and
can't, we should be returning a failure indicator, not providing a
strange interface to the user for receiving a callback in the event of
such an error.

also in general, libraries should never write to stdout or stderr.

this breaks the API/ABI and will require a note in the ChangeLog.
2014-01-13 15:35:44 -05:00
Robert Edmonds
8cd5f6764b protobuf-c: remove tmp_alloc and max_alloca fields of ProtobufCAllocator
i'm confused as to why these fields exist, since the typical
implementation of a "temporary alloc" would be something like alloca(),
and alloca() is usually just inlined code that adjusts the stack
pointer, which is not a function whose address could be taken.

this breaks the API/ABI and will require a note in the ChangeLog.

possibly we could revisit the idea of "temporary allocations" by using
C99 variable length arrays. this would have the advantage of being
standardized, unlike alloca().
2014-01-13 15:35:42 -05:00
Robert Edmonds
a533b594f7 spelling: "prefered" -> "preferred" 2014-01-13 14:57:54 -05:00
Robert Edmonds
871d678738 protobuf-c: remove UNALIGNED_ALLOC, DO_UNALIGNED_ALLOC macros 2014-01-13 14:19:28 -05:00
Robert Edmonds
b8c5e06de3 ChangeLog: coverity fixes 2014-01-11 15:52:16 -05:00
Robert Edmonds
da3dd5239a GenerateMessageDescriptor(): free field_indices, Coverity #1153644 2014-01-11 15:44:36 -05:00
Robert Edmonds
92b31528f8 GenerateEnumDescriptor(): free value_index, Coverity #1153645 2014-01-11 15:42:24 -05:00
Robert Edmonds
fb44851b4e GenerateEnumDescriptor(): free name_index, Coverity #1153646 2014-01-11 15:40:27 -05:00
Robert Edmonds
5a43922c6a GenerateServiceDescriptor(): free mi_array, Coverity #1153647 2014-01-11 15:38:29 -05:00
Robert Edmonds
aae02aa008 protobuf_c_message_unpack(): reflow some long lines for readability 2014-01-11 15:31:34 -05:00
Robert Edmonds
596352bb22 protobuf_c_message_unpack(): initialize tmp.length_prefix_len
this should silence Coverity #1153648, which complains because
tmp.length_prefix_len is uninitialized for certain wire types when
copied on line 2486:

    scanned_member_slabs[which_slab][in_slab_index++] = tmp;
2014-01-11 15:28:47 -05:00
Robert Edmonds
ac71dd5859 configure.ac: error out if protoc is not found 2014-01-11 15:04:30 -05:00
Robert Edmonds
c797b07eec protobuf-c/: gratuitous style changes
dave's original style drives me crazy. reformat the C code in
protobuf-c/ with "indent -kr -i8" and manually reflow for readability.

try to fit most lines in 80 columns, but due to the lengthy type and
function names in protobuf-c, enforcing an 80 column rule would result
in a lot of cramped statements, so try to fit lines in up to 100 columns
if it would improve readability. (e.g., one <=100 column line is
probably better than 3-4 <=80 column lines.)

ultimately i'd like to adopt most of the recommendations in the linux
coding style: https://www.kernel.org/doc/Documentation/CodingStyle.
this commit gets us most of the kernel indentation and comment coding
style recommendations. later commits will tackle style recommendations
that require more intrusive changes: breaking up large functions,
replacing macros that affect control flow (e.g., DO_ALLOC). this will
hopefully facilitate review and make the code base easier to maintain.

i ran the old and new versions of protobuf-c.c through something like:

  gcc -S -D__PRETTY_FUNCTION__=0 -D__FILE__=0 -D__LINE__=0 -Wall -O0 \
    -o protobuf-c.S -c protobuf-c.c

and reviewed the diffs of the assembly output to spot any functions that
changed, and went back to make sure that any differences were
functionally equivalent.
2014-01-11 13:41:11 -05:00
Robert Edmonds
934ff223db README.md: update due to the protobuf-c-rpc split out 2014-01-10 13:25:11 -05:00
Robert Edmonds
e3c49dfff2 TODO: remove protobuf-c-rpc 2014-01-10 13:25:11 -05:00
Robert Edmonds
ce1c8bbeb5 protobuf-c-rpc/: remove 2014-01-10 13:25:11 -05:00
Robert Edmonds
10e451eb6a .gitignore: remove protobuf-c-rpc 2014-01-10 13:25:11 -05:00
Robert Edmonds
5c4f8eafa7 .travis.yml: remove protobuf-c-rpc 2014-01-10 13:25:11 -05:00
Robert Edmonds
410a5b8e4e configure.ac: remove protobuf-c-rpc 2014-01-10 13:25:11 -05:00
Robert Edmonds
e8a55cf186 Makefile.am: remove protobuf-c-rpc 2014-01-10 13:25:11 -05:00
Ilya Lipnitskiy
0e9f999aa8 protobuf-c/protobuf-c.c: do not print unpack errors by default
(fixes #26)
2013-12-21 00:05:11 -08:00
Nick Galbreath
c1ff5d6bad protobuf-c/protobuf-c.c: prevent possible overflow on 64-bit systems
(fixes #106)
2013-12-20 23:45:19 -08:00
Ilya Lipnitskiy
b915eed32f protobuf-c/protobuf-c.c: fix compiler warnings (fixes #115)
protoc-c/c_enum.cc: fix compiler warnings
protoc-c/c_field.cc: fix compiler warnings
2013-12-17 00:08:42 -08:00
Robert Edmonds
9f39b7621e LICENSE: add a statement about the ownership of protoc-c output
Signed-off-by: Dave Benson <lahiker42@gmail.com>
2013-12-09 14:09:10 -05:00
Robert Edmonds
db4ab0ee85 ChangeLog: fix trailing whitespace 2013-12-09 14:08:57 -05:00
Ilya Lipnitskiy
ffb1c2462a protobuf-c/protobuf-c.c: add explicit casts in parsing functions for
better compatibility with 8- and 16-bit platforms (integrate fixes
from #47)
2013-12-03 22:40:40 -08:00