Repository: qpid-proton Updated Branches: refs/heads/master 431a86a80 -> 391397f59
PROTON-1766: [c] Move pn_connection_driver_ptr back to to connection_driver.h Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/06667197 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/06667197 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/06667197 Branch: refs/heads/master Commit: 06667197824bf1bbf8dc903c80ad3c651302e73c Parents: 431a86a Author: Alan Conway <[email protected]> Authored: Wed Feb 21 14:49:12 2018 -0500 Committer: Alan Conway <[email protected]> Committed: Wed Feb 21 17:01:55 2018 -0500 ---------------------------------------------------------------------- proton-c/include/proton/connection_driver.h | 13 ++++++++ proton-c/src/core/connection_driver-internal.h | 35 --------------------- proton-c/src/core/connection_driver.c | 2 +- proton-c/src/proactor/epoll.c | 1 - 4 files changed, 14 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06667197/proton-c/include/proton/connection_driver.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/connection_driver.h b/proton-c/include/proton/connection_driver.h index 8e39551..e83e2e9 100644 --- a/proton-c/include/proton/connection_driver.h +++ b/proton-c/include/proton/connection_driver.h @@ -267,6 +267,19 @@ PN_EXTERN void pn_connection_driver_logf(pn_connection_driver_t *d, const char * PN_EXTERN void pn_connection_driver_vlogf(pn_connection_driver_t *d, const char *fmt, va_list ap); /** + * Associate a pn_connection_t with its pn_connection_driver_t. + * + * **NOTE**: this is only for use by IO integration writers. If you are using the standard + * pn_proactor_t you *must not* use this function. + * + * @return pointer to the pn_connection_driver_t* field in a pn_connection_t. + * + * Return type is pointer to a pointer so that the caller can (if desired) use + * atomic operations when loading and storing the value. + */ +PN_EXTERN pn_connection_driver_t **pn_connection_driver_ptr(pn_connection_t *connection); + +/** * @} */ http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06667197/proton-c/src/core/connection_driver-internal.h ---------------------------------------------------------------------- diff --git a/proton-c/src/core/connection_driver-internal.h b/proton-c/src/core/connection_driver-internal.h deleted file mode 100644 index 519a25b..0000000 --- a/proton-c/src/core/connection_driver-internal.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef CORE_CONNECTION_DRIVER_INTERNAL_H -#define CORE_CONNECTION_DRIVER_INTERNAL_H - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -#include <proton/import_export.h> -#include <proton/connection_driver.h> - -/** - * @return pointer to the pn_connection_driver_t* field in a pn_connection_t. - * Only for use by IO integration code (e.g. pn_proactor_t implementations use this pointer) - * - * Return type is pointer to a pointer so that the caller can (if desired) use - * atomic operations when loading and storing the value. - */ -PN_EXTERN pn_connection_driver_t **pn_connection_driver_ptr(pn_connection_t *connection); - -#endif // CORE_CONNECTION_DRIVER_INTERNAL_H http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06667197/proton-c/src/core/connection_driver.c ---------------------------------------------------------------------- diff --git a/proton-c/src/core/connection_driver.c b/proton-c/src/core/connection_driver.c index 2460a4a..7120f2c 100644 --- a/proton-c/src/core/connection_driver.c +++ b/proton-c/src/core/connection_driver.c @@ -18,9 +18,9 @@ */ #include "engine-internal.h" -#include "connection_driver-internal.h" #include <proton/condition.h> #include <proton/connection.h> +#include <proton/connection_driver.h> #include <proton/event.h> #include <proton/transport.h> #include <string.h> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/06667197/proton-c/src/proactor/epoll.c ---------------------------------------------------------------------- diff --git a/proton-c/src/proactor/epoll.c b/proton-c/src/proactor/epoll.c index 4094b43..d9090f0 100644 --- a/proton-c/src/proactor/epoll.c +++ b/proton-c/src/proactor/epoll.c @@ -27,7 +27,6 @@ #undef _GNU_SOURCE #include "../core/log_private.h" -#include "../core/connection_driver-internal.h" #include "./proactor-internal.h" #include <proton/condition.h> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
