Author: gsim Date: Fri Oct 10 12:51:33 2014 New Revision: 1630819 URL: http://svn.apache.org/r1630819 Log: PROTON-686, PROTON-???: Fix recent changes to compile on windows
Modified: qpid/proton/branches/examples/proton-c/bindings/python/cproton.i qpid/proton/branches/examples/proton-c/include/proton/event.h qpid/proton/branches/examples/proton-c/include/proton/object.h qpid/proton/branches/examples/proton-c/src/object/string.c qpid/proton/branches/examples/proton-c/src/windows/io.c qpid/proton/branches/examples/proton-c/src/windows/iocp.c qpid/proton/branches/examples/proton-c/src/windows/iocp.h qpid/proton/branches/examples/proton-c/src/windows/selector.c qpid/proton/branches/examples/proton-c/src/windows/write_pipeline.c Modified: qpid/proton/branches/examples/proton-c/bindings/python/cproton.i URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/bindings/python/cproton.i?rev=1630819&r1=1630818&r2=1630819&view=diff ============================================================================== --- qpid/proton/branches/examples/proton-c/bindings/python/cproton.i (original) +++ qpid/proton/branches/examples/proton-c/bindings/python/cproton.i Fri Oct 10 12:51:33 2014 @@ -234,8 +234,9 @@ int pn_ssl_get_peer_hostname(pn_ssl_t *s PyObject *pn_void2py(void *object) { if (object) { - Py_INCREF(object); - return object; + PyObject* p = (PyObject*) object; + Py_INCREF(p); + return p; } else { Py_RETURN_NONE; } Modified: qpid/proton/branches/examples/proton-c/include/proton/event.h URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/include/proton/event.h?rev=1630819&r1=1630818&r2=1630819&view=diff ============================================================================== --- qpid/proton/branches/examples/proton-c/include/proton/event.h (original) +++ qpid/proton/branches/examples/proton-c/include/proton/event.h Fri Oct 10 12:51:33 2014 @@ -272,9 +272,9 @@ PN_EXTERN void pn_collector_free(pn_coll * was elided */ -pn_event_t *pn_collector_put(pn_collector_t *collector, - const pn_class_t *clazz, void *context, - pn_event_type_t type); +PN_EXTERN pn_event_t *pn_collector_put(pn_collector_t *collector, + const pn_class_t *clazz, void *context, + pn_event_type_t type); /** * Access the head event contained by a collector. Modified: qpid/proton/branches/examples/proton-c/include/proton/object.h URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/include/proton/object.h?rev=1630819&r1=1630818&r2=1630819&view=diff ============================================================================== --- qpid/proton/branches/examples/proton-c/include/proton/object.h (original) +++ qpid/proton/branches/examples/proton-c/include/proton/object.h Fri Oct 10 12:51:33 2014 @@ -58,9 +58,9 @@ struct pn_class_t { int (*inspect)(void *, pn_string_t *); }; -extern const pn_class_t *PN_OBJECT; -extern const pn_class_t *PN_VOID; -extern const pn_class_t *PN_WEAKREF; +PN_EXTERN extern const pn_class_t *PN_OBJECT; +PN_EXTERN extern const pn_class_t *PN_VOID; +PN_EXTERN extern const pn_class_t *PN_WEAKREF; #define PN_CLASS(PREFIX) { \ #PREFIX, \ Modified: qpid/proton/branches/examples/proton-c/src/object/string.c URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/src/object/string.c?rev=1630819&r1=1630818&r2=1630819&view=diff ============================================================================== --- qpid/proton/branches/examples/proton-c/src/object/string.c (original) +++ qpid/proton/branches/examples/proton-c/src/object/string.c Fri Oct 10 12:51:33 2014 @@ -19,8 +19,11 @@ * */ +#include "platform.h" + #include <proton/error.h> #include <proton/object.h> + #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: qpid/proton/branches/examples/proton-c/src/windows/io.c URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/src/windows/io.c?rev=1630819&r1=1630818&r2=1630819&view=diff ============================================================================== --- qpid/proton/branches/examples/proton-c/src/windows/io.c (original) +++ qpid/proton/branches/examples/proton-c/src/windows/io.c Fri Oct 10 12:51:33 2014 @@ -103,7 +103,7 @@ void pn_io_finalize(void *obj) pn_io_t *pn_io(void) { static const pn_class_t clazz = PN_CLASS(pn_io); - pn_io_t *io = (pn_io_t *) pn_new(sizeof(pn_io_t), &clazz); + pn_io_t *io = (pn_io_t *) pn_class_new(&clazz, sizeof(pn_io_t)); return io; } Modified: qpid/proton/branches/examples/proton-c/src/windows/iocp.c URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/src/windows/iocp.c?rev=1630819&r1=1630818&r2=1630819&view=diff ============================================================================== --- qpid/proton/branches/examples/proton-c/src/windows/iocp.c (original) +++ qpid/proton/branches/examples/proton-c/src/windows/iocp.c Fri Oct 10 12:51:33 2014 @@ -162,8 +162,7 @@ typedef struct { } accept_result_t; static accept_result_t *accept_result(iocpdesc_t *listen_sock) { - accept_result_t *result = (accept_result_t *) pn_new(sizeof(accept_result_t), 0); - memset(result, 0, sizeof(accept_result_t)); + accept_result_t *result = (accept_result_t *)calloc(1, sizeof(accept_result_t)); if (result) { result->base.type = IOCP_ACCEPT; result->base.iocpd = listen_sock; @@ -192,7 +191,7 @@ struct pni_acceptor_t { static void pni_acceptor_initialize(void *object) { pni_acceptor_t *acceptor = (pni_acceptor_t *) object; - acceptor->accepts = pn_list(IOCP_MAX_ACCEPTS, 0); + acceptor->accepts = pn_list(PN_OBJECT, IOCP_MAX_ACCEPTS); } static void pni_acceptor_finalize(void *object) @@ -207,7 +206,7 @@ static void pni_acceptor_finalize(void * static pni_acceptor_t *pni_acceptor(iocpdesc_t *iocpd) { static const pn_class_t clazz = PN_CLASS(pni_acceptor); - pni_acceptor_t *acceptor = (pni_acceptor_t *) pn_new(sizeof(pni_acceptor_t), &clazz); + pni_acceptor_t *acceptor = (pni_acceptor_t *) pn_class_new(&clazz, sizeof(pni_acceptor_t)); acceptor->listen_sock = iocpd; acceptor->accept_queue_size = 0; acceptor->signalled = false; @@ -365,7 +364,7 @@ static void connect_result_finalize(void static connect_result_t *connect_result(iocpdesc_t *iocpd, struct addrinfo *addr) { static const pn_class_t clazz = PN_CLASS(connect_result); - connect_result_t *result = (connect_result_t *) pn_new(sizeof(connect_result_t), &clazz); + connect_result_t *result = (connect_result_t *) pn_class_new(&clazz, sizeof(connect_result_t)); if (result) { memset(result, 0, sizeof(connect_result_t)); result->base.type = IOCP_CONNECT; @@ -599,7 +598,7 @@ static void begin_zero_byte_read(iocpdes } static void drain_until_closed(iocpdesc_t *iocpd) { - int max_drain = 16 * 1024; + size_t max_drain = 16 * 1024; char buf[512]; read_result_t *result = iocpd->read_result; while (result->drain_count < max_drain) { @@ -732,7 +731,7 @@ static iocpdesc_t *pni_iocpdesc(pn_socke { static pn_class_t clazz = PN_CLASS(pni_iocpdesc); assert (s != INVALID_SOCKET); - iocpdesc_t *iocpd = (iocpdesc_t *) pn_new(sizeof(iocpdesc_t), &clazz); + iocpdesc_t *iocpd = (iocpdesc_t *) pn_class_new(&clazz, sizeof(iocpdesc_t)); assert(iocpd); iocpd->socket = s; return iocpd; @@ -1133,6 +1132,6 @@ void pni_iocp_finalize(void *obj) iocp_t *pni_iocp() { static const pn_class_t clazz = PN_CLASS(pni_iocp); - iocp_t *iocp = (iocp_t *) pn_new(sizeof(iocp_t), &clazz); + iocp_t *iocp = (iocp_t *) pn_class_new(&clazz, sizeof(iocp_t)); return iocp; } Modified: qpid/proton/branches/examples/proton-c/src/windows/iocp.h URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/src/windows/iocp.h?rev=1630819&r1=1630818&r2=1630819&view=diff ============================================================================== --- qpid/proton/branches/examples/proton-c/src/windows/iocp.h (original) +++ qpid/proton/branches/examples/proton-c/src/windows/iocp.h Fri Oct 10 12:51:33 2014 @@ -47,7 +47,7 @@ struct iocp_t { char *shared_pool_memory; write_result_t **shared_results; write_result_t **available_results; - int shared_available_count; + size_t shared_available_count; size_t writer_count; int loopback_bufsize; bool iocp_trace; Modified: qpid/proton/branches/examples/proton-c/src/windows/selector.c URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/src/windows/selector.c?rev=1630819&r1=1630818&r2=1630819&view=diff ============================================================================== --- qpid/proton/branches/examples/proton-c/src/windows/selector.c (original) +++ qpid/proton/branches/examples/proton-c/src/windows/selector.c Fri Oct 10 12:51:33 2014 @@ -95,7 +95,7 @@ void pn_selector_finalize(void *obj) pn_selector_t *pni_selector() { static const pn_class_t clazz = PN_CLASS(pn_selector); - pn_selector_t *selector = (pn_selector_t *) pn_new(sizeof(pn_selector_t), &clazz); + pn_selector_t *selector = (pn_selector_t *) pn_class_new(&clazz, sizeof(pn_selector_t)); return selector; } Modified: qpid/proton/branches/examples/proton-c/src/windows/write_pipeline.c URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/src/windows/write_pipeline.c?rev=1630819&r1=1630818&r2=1630819&view=diff ============================================================================== --- qpid/proton/branches/examples/proton-c/src/windows/write_pipeline.c (original) +++ qpid/proton/branches/examples/proton-c/src/windows/write_pipeline.c Fri Oct 10 12:51:33 2014 @@ -169,7 +169,7 @@ static void write_pipeline_finalize(void write_pipeline_t *pni_write_pipeline(iocpdesc_t *iocpd) { static const pn_class_t clazz = PN_CLASS(write_pipeline); - write_pipeline_t *pipeline = (write_pipeline_t *) pn_new(sizeof(write_pipeline_t), &clazz); + write_pipeline_t *pipeline = (write_pipeline_t *) pn_class_new(&clazz, sizeof(write_pipeline_t)); pipeline->iocpd = iocpd; pipeline->primary->base.iocpd = iocpd; return pipeline; @@ -243,15 +243,15 @@ size_t pni_write_pipeline_reserve(write_ iocp_t *iocp = pl->iocpd->iocp; confirm_as_writer(pl); - int wanted = (count / IOCP_WBUFSIZE); + size_t wanted = (count / IOCP_WBUFSIZE); if (count % IOCP_WBUFSIZE) wanted++; size_t pending = pl->pending_count; assert(pending < pl->depth); - int bufs = pn_min(wanted, pl->depth - pending); + size_t bufs = pn_min(wanted, pl->depth - pending); // Can draw from shared pool or the primary... but share with others. size_t writers = iocp->writer_count; - int shared_count = (iocp->shared_available_count + writers - 1) / writers; + size_t shared_count = (iocp->shared_available_count + writers - 1) / writers; bufs = pn_min(bufs, shared_count + 1); pl->reserved_count = pending + bufs; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org