Commit Graph

205 Commits

Author SHA1 Message Date
Nicolas Noble ae94d8657c Merge pull request #1451 from michael-berlin/fix_protobuf_dep_shared_lib
Fix parallel make + MINGW32 dependencies.
2015-05-01 17:18:56 -07:00
Michael Berlin bf2e7f0982 Compile protobuf before compiling shared C++ libraries.
This change fixes a parallel make which always failed with "cannot find
-lprotobuf".

For C++ static libraries, protobuf was already added as dependency, see
commit 5383062df6.
2015-05-01 16:21:23 -07:00
Michael Berlin 5351392f88 Makefile: Fix missing space in shared library dependencies for MINGW32. 2015-05-01 16:20:54 -07:00
Craig Tiller 113d169f8f Add rdtsc profiling support, implement begin/end and tag hiding 2015-05-01 15:26:15 -07:00
Craig Tiller 74bbc41175 Ensure all unsecure tests are built on Windows 2015-04-30 14:11:11 -07:00
Craig Tiller f2791ab02b Merge pull request #1408 from dgquintas/stap
Integration of Systemtap as a profiling mechanism.
2015-04-30 13:05:56 -07:00
Craig Tiller 2e4a7dc2fe Make gcov compile flags reflect dbg 2015-04-30 09:22:31 -07:00
David Garcia Quintas bbc0b775e1 Merge comments. See below.
- Added ptag ignore annotation threshold
- prefixed everythig with grpc_
- removed spurious annotations in channel_create.c and client_channel.c
- removed stap_probes.h (it's generated from stap_probes.d by make)
- Updated Makefile and its template with the right way to generate stap
  probe headers from its .d definition.
2015-04-29 14:10:05 -07:00
David Garcia Quintas c3edfc4b2b Fixed repetitions in Makefile.template. 2015-04-29 10:41:16 -07:00
David Garcia Quintas 45d54e4581 Merge remote-tracking branch 'upstream/master' into stap 2015-04-29 09:48:43 -07:00
David Garcia Quintas 8954e90b72 Integration of Systemtap (STAP) for profiling.
This commit includes a faulty Makefile to be fixed in a follow commit.
2015-04-29 09:46:33 -07:00
Nicolas "Pixel" Noble adaa100e3e Trimming down useless variables in the Makefile.
A bunch of autogenerated variables are currently useless, because of tests actually having no source code attached to them. Let's avoid emitting useless code in that case.
2015-04-29 09:05:25 +02:00
David Garcia Quintas b5d19fb1fa Merge branch 'master' into stap 2015-04-27 16:00:09 -07:00
David Garcia Quintas 611b7362c6 Tentative stap version 2015-04-27 15:49:31 -07:00
Nicolas "Pixel" Noble 5fb4ba0adb Updating the templates to create win64 projects. 2015-04-28 00:20:06 +02:00
zeliard 3e3e0ad348 merge from upstream (grpc) master 2015-04-27 14:56:34 +09:00
Nicolas Noble 1eef5aa1eb Merge pull request #1368 from dgquintas/mkfile_proto_cmd_fix
Renamed make variables for protoc presence and version checking.
2015-04-24 17:44:50 -07:00
David Garcia Quintas f5fcafde81 Renamed make variables for protoc presence and version checking. 2015-04-24 16:12:54 -07:00
Craig Tiller 04f8156f65 Cleanup 2015-04-24 14:34:30 -07:00
Craig Tiller 2660ebcff0 Actually remove them 2015-04-24 14:31:30 -07:00
Craig Tiller d896fa5640 Remove some useless lines in the Makefile 2015-04-24 14:30:09 -07:00
Nicolas "Pixel" Noble 010f1e7b62 More work in not having to compile OpenSSL. 2015-04-23 03:30:15 +02:00
Craig Tiller b4b185c1e4 Merge pull request #1339 from nicolasnoble/template-doc
Adding some documentation about the build/template system.
2015-04-22 16:25:38 -07:00
Craig Tiller 2b1f7a959f Merge github.com:google/grpc into batch-metadata 2015-04-22 07:57:21 -07:00
Nicolas "Pixel" Noble 8512fba380 Adding some documentation about the build/template system. 2015-04-22 03:28:48 +02:00
Tim Emiola 1895b4a9ee Merge pull request #1325 from jtattermusch/grpc_nuget
Creating nuget package for gRPC C#
2015-04-21 15:40:07 -07:00
Craig Tiller 062db022b7 Merge github.com:google/grpc into batch-metadata
Conflicts:
	Makefile
	vsprojects/Grpc.mak
	vsprojects/vs2010/Grpc.mak
	vsprojects/vs2010/grpc.vcxproj
	vsprojects/vs2010/grpc.vcxproj.filters
	vsprojects/vs2010/grpc_test_util.vcxproj
	vsprojects/vs2010/grpc_unsecure.vcxproj
	vsprojects/vs2010/grpc_unsecure.vcxproj.filters
2015-04-21 13:57:55 -07:00
Nicolas "Pixel" Noble d49893db82 Adding a helpful warning message on top of the Makefile and BUILD file. 2015-04-21 04:57:45 +02:00
Jan Tattermusch 65c2020d89 fix typo in vcxproj template 2015-04-20 19:44:45 -07:00
Jan Tattermusch 87d621bcf4 fixes to Grpc.mak 2015-04-20 19:20:48 -07:00
Jan Tattermusch 789e7aee60 updated version of nuget packages used in Grpc.mak 2015-04-20 19:20:42 -07:00
Jan Tattermusch f6f6fdb49f start using grpc.dependencies.openssl and grpc.dependencies.zlib nuget packages 2015-04-20 19:18:27 -07:00
Jan Tattermusch b5bf574e0c regenerated project files 2015-04-20 19:18:25 -07:00
Jan Tattermusch 8ab4538343 introduced packages.include 2015-04-20 19:18:24 -07:00
Jan Tattermusch 8ff00a3c25 big refactoring of visual studio projects, started using nuget
dependencies.
2015-04-20 19:18:22 -07:00
Craig Tiller c8a2299fe8 Merge github.com:grpc/grpc into batch-metadata 2015-04-20 09:04:57 -07:00
Yang Gao 736bd6515c Avoid generating libs for unknown types. 2015-04-16 15:42:42 -07:00
Craig Tiller 6902ad2e9c Switching to batch oriented metadata passing 2015-04-16 14:22:28 -07:00
Craig Tiller 5fa5042850 Merge pull request #1267 from vjpai/timers
Infrastructure for timer insertion, logging, and testing
2015-04-14 16:46:29 -07:00
Nicolas Noble f44112198f Merge pull request #1272 from yang-g/interop
Further refactor interop_client and server to libraries
2015-04-13 18:02:34 -07:00
Yang Gao b0b518e367 Further refactor interop_client and server to libraries 2015-04-13 14:53:25 -07:00
Vijay Pai 83df2c3231 Merge branch 'master' of git://github.com/vjpai/grpc into timers 2015-04-13 14:10:51 -07:00
Vijay Pai bc17113192 Allow a build config called CONFIG=latprof that defines the appropriate
variables to set up the GRPC_LATENCY_PROFILER preprocessor macro so that timing
actually takes place.
2015-04-13 10:58:06 -07:00
Craig Tiller 0a94998826 Merge github.com:grpc/grpc into windows-fixes
Conflicts:
	BUILD
	src/core/iomgr/tcp_server.h
	src/core/iomgr/tcp_server_posix.c
	src/core/iomgr/tcp_server_windows.c
	src/core/security/server_secure_chttp2.c
	src/core/surface/completion_queue.c
	src/core/surface/completion_queue.h
	src/core/surface/server.c
	test/core/end2end/tests/cancel_after_invoke.c
	test/core/end2end/tests/cancel_test_helpers.h
	tools/run_tests/tests.json
	vsprojects/vs2013/Grpc.mak
2015-04-13 10:08:44 -07:00
Ming Zhao 3c0ba0c2d6 Extend bazel BUILD file to build all the C/C++ libraries as well as
protobuf plugins. This requires WORKSPACE to define these external
dependencies for openssl and protobuf, for examples:

bind(
  name = "libssl",
  actual = "//third_party/boringssl:boringssl",
)

# Library needed to build protobuf codegen plugin.
bind(
  name = "protobuf_compiler",
  actual = "//third_party/protobuf:protoc_lib",
)

# Library that C++ code generated by protobuf C compiler should depend
# on.
bind(
  name = "protobuf_clib",
  actual = "//third_party/protobuf:proto_lib",
)
2015-04-10 12:06:51 -07:00
Michael Lumish da0bebc203 Merge pull request #1246 from tbetbetbe/grpc_tools_makefile_update_install_lns
Fixes the Makefile template to link .so.<MAJOR_VERSION>
2015-04-10 10:06:19 -07:00
Tim Emiola 820e3d612a Fixes the Makefile template to link .so.<MAJOR_VERSION>
This resolves a blocker stopping a clean linuxbrew install to work with one of
the wrapped libraries.
2015-04-10 09:30:30 -07:00
Nicolas "Pixel" Noble 0caebbfcfe Splitting gRPC service class codegen into its own set of files. 2015-04-09 23:08:51 +02:00
Craig Tiller fef0c2dcf5 Dont build uninteresting tests on Windows 2015-04-08 15:58:59 -07:00
Craig Tiller 0ff7e692b0 Better defaulting of attributes 2015-04-08 15:57:17 -07:00