diff options
| author | malosek <malosek@fastmq.com> | 2010-01-05 11:05:03 +0100 |
|---|---|---|
| committer | malosek <malosek@fastmq.com> | 2010-01-05 11:05:03 +0100 |
| commit | 472ddf8de2c93f750831d52b5473cdbed1db51e8 (patch) | |
| tree | 476650afd868502a5a023599910c5415fdc57fe6 /src | |
| parent | d10c605fa94a8fe8265785043aeef63983e07f3f (diff) | |
| parent | 4f6baf4dde627656b63cc4e2acdb78a8577ba640 (diff) | |
fixed failed merge with autogen.sh
Diffstat (limited to 'src')
114 files changed, 132 insertions, 119 deletions
diff --git a/src/app_thread.cpp b/src/app_thread.cpp index 69e0942..c55eb75 100644 --- a/src/app_thread.cpp +++ b/src/app_thread.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/app_thread.hpp b/src/app_thread.hpp index 14cb8c5..0e2c3e1 100644 --- a/src/app_thread.hpp +++ b/src/app_thread.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/atomic_bitmap.hpp b/src/atomic_bitmap.hpp index 6b7218e..6620f06 100644 --- a/src/atomic_bitmap.hpp +++ b/src/atomic_bitmap.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/atomic_counter.hpp b/src/atomic_counter.hpp index 2cd225a..649fdbf 100644 --- a/src/atomic_counter.hpp +++ b/src/atomic_counter.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp index f96782f..3735e99 100644 --- a/src/atomic_ptr.hpp +++ b/src/atomic_ptr.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/command.hpp b/src/command.hpp index 8aa7c56..469d6ec 100644 --- a/src/command.hpp +++ b/src/command.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/config.hpp b/src/config.hpp index 43a4513..9724733 100644 --- a/src/config.hpp +++ b/src/config.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/decoder.hpp b/src/decoder.hpp index 5098dd5..1662bda 100644 --- a/src/decoder.hpp +++ b/src/decoder.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/devpoll.cpp b/src/devpoll.cpp index 0ee772b..003f465 100644 --- a/src/devpoll.cpp +++ b/src/devpoll.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/devpoll.hpp b/src/devpoll.hpp index b796ba5..019d268 100644 --- a/src/devpoll.hpp +++ b/src/devpoll.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp index 7115bca..9e713c2 100644 --- a/src/dispatcher.cpp +++ b/src/dispatcher.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/dispatcher.hpp b/src/dispatcher.hpp index 8364d4d..799e65b 100644 --- a/src/dispatcher.hpp +++ b/src/dispatcher.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/downstream.cpp b/src/downstream.cpp index be1c4cc..2da08e3 100644 --- a/src/downstream.cpp +++ b/src/downstream.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/downstream.hpp b/src/downstream.hpp index bf8cabb..35dec95 100644 --- a/src/downstream.hpp +++ b/src/downstream.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/encoder.hpp b/src/encoder.hpp index cb43f9f..bd62298 100644 --- a/src/encoder.hpp +++ b/src/encoder.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/epoll.cpp b/src/epoll.cpp index b25883f..e22eb8c 100644 --- a/src/epoll.cpp +++ b/src/epoll.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/epoll.hpp b/src/epoll.hpp index 90824bd..38175cb 100644 --- a/src/epoll.hpp +++ b/src/epoll.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/err.cpp b/src/err.cpp index 36cb2fc..0ff6335 100644 --- a/src/err.cpp +++ b/src/err.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/err.hpp b/src/err.hpp index 88097b5..6c13b02 100644 --- a/src/err.hpp +++ b/src/err.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/fd_signaler.cpp b/src/fd_signaler.cpp index 5a8dcc1..a3a73c1 100644 --- a/src/fd_signaler.cpp +++ b/src/fd_signaler.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/fd_signaler.hpp b/src/fd_signaler.hpp index 513a1e4..f2037a9 100644 --- a/src/fd_signaler.hpp +++ b/src/fd_signaler.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/i_endpoint.hpp b/src/i_endpoint.hpp index 3bab2a5..3abd159 100644 --- a/src/i_endpoint.hpp +++ b/src/i_endpoint.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/i_engine.hpp b/src/i_engine.hpp index c21556f..d5d7811 100644 --- a/src/i_engine.hpp +++ b/src/i_engine.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/i_inout.hpp b/src/i_inout.hpp index 8a0ce6a..1053449 100644 --- a/src/i_inout.hpp +++ b/src/i_inout.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/i_poll_events.hpp b/src/i_poll_events.hpp index 8893b45..8b85f7a 100644 --- a/src/i_poll_events.hpp +++ b/src/i_poll_events.hpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2007-2009 FastMQ Inc. +Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/i_signaler.hpp b/src/i_signaler.hpp index ad04bb5..822ab8e 100644 --- a/src/i_signaler.hpp +++ b/src/i_signaler.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/io_object.cpp b/src/io_object.cpp index 0cf77fd..086f173 100644 --- a/src/io_object.cpp +++ b/src/io_object.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/io_object.hpp b/src/io_object.hpp index 7b66687..655e7f5 100644 --- a/src/io_object.hpp +++ b/src/io_object.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/io_thread.cpp b/src/io_thread.cpp index 1332795..2e1237b 100644 --- a/src/io_thread.cpp +++ b/src/io_thread.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/io_thread.hpp b/src/io_thread.hpp index c0dd77b..9377515 100644 --- a/src/io_thread.hpp +++ b/src/io_thread.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/kqueue.cpp b/src/kqueue.cpp index 8e33bdb..bf9c8a2 100644 --- a/src/kqueue.cpp +++ b/src/kqueue.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/kqueue.hpp b/src/kqueue.hpp index bed9108..d2dd09a 100644 --- a/src/kqueue.hpp +++ b/src/kqueue.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/likely.hpp b/src/likely.hpp index 3ca7bd6..b7a8171 100644 --- a/src/likely.hpp +++ b/src/likely.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/msg_content.hpp b/src/msg_content.hpp index cb217b7..3daf0e6 100644 --- a/src/msg_content.hpp +++ b/src/msg_content.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/mutex.hpp b/src/mutex.hpp index e233c9e..3306d2e 100644 --- a/src/mutex.hpp +++ b/src/mutex.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/object.cpp b/src/object.cpp index 66079db..20e712a 100644 --- a/src/object.cpp +++ b/src/object.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/object.hpp b/src/object.hpp index b8d06b9..e6b2379 100644 --- a/src/object.hpp +++ b/src/object.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/options.cpp b/src/options.cpp index 3f903cb..cc02798 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/options.hpp b/src/options.hpp index 16bb857..b066d48 100644 --- a/src/options.hpp +++ b/src/options.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/owned.cpp b/src/owned.cpp index 1cb331c..d6be444 100644 --- a/src/owned.cpp +++ b/src/owned.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/owned.hpp b/src/owned.hpp index bfa8185..91189a1 100644 --- a/src/owned.hpp +++ b/src/owned.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/p2p.cpp b/src/p2p.cpp index 445ba5b..ae2424a 100644 --- a/src/p2p.cpp +++ b/src/p2p.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/p2p.hpp b/src/p2p.hpp index 32d7755..5bbe111 100644 --- a/src/p2p.hpp +++ b/src/p2p.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pgm_receiver.cpp b/src/pgm_receiver.cpp index e9868f6..b611324 100644 --- a/src/pgm_receiver.cpp +++ b/src/pgm_receiver.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pgm_receiver.hpp b/src/pgm_receiver.hpp index 6fadbc3..3d6a212 100644 --- a/src/pgm_receiver.hpp +++ b/src/pgm_receiver.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pgm_sender.cpp b/src/pgm_sender.cpp index 0d87ee0..010d99f 100644 --- a/src/pgm_sender.cpp +++ b/src/pgm_sender.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pgm_sender.hpp b/src/pgm_sender.hpp index e280843..8eb9d88 100644 --- a/src/pgm_sender.hpp +++ b/src/pgm_sender.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp index c79112b..0fbe58a 100644 --- a/src/pgm_socket.cpp +++ b/src/pgm_socket.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pgm_socket.hpp b/src/pgm_socket.hpp index 3b2740c..502496a 100644 --- a/src/pgm_socket.hpp +++ b/src/pgm_socket.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pipe.cpp b/src/pipe.cpp index d994430..a8e7bb9 100644 --- a/src/pipe.cpp +++ b/src/pipe.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pipe.hpp b/src/pipe.hpp index 9083ccd..a155e95 100644 --- a/src/pipe.hpp +++ b/src/pipe.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/poll.cpp b/src/poll.cpp index 50a2426..889ea4a 100644 --- a/src/poll.cpp +++ b/src/poll.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/poll.hpp b/src/poll.hpp index 05732d0..5b8e745 100644 --- a/src/poll.hpp +++ b/src/poll.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/poller.hpp b/src/poller.hpp index 9051514..b769283 100644 --- a/src/poller.hpp +++ b/src/poller.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pub.cpp b/src/pub.cpp index 63b235e..05bfdcf 100644 --- a/src/pub.cpp +++ b/src/pub.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/pub.hpp b/src/pub.hpp index 9dbcb4a..5b2f348 100644 --- a/src/pub.hpp +++ b/src/pub.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/rep.cpp b/src/rep.cpp index f06f4ab..b6bffae 100644 --- a/src/rep.cpp +++ b/src/rep.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/rep.hpp b/src/rep.hpp index 0b327aa..7170da7 100644 --- a/src/rep.hpp +++ b/src/rep.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/req.cpp b/src/req.cpp index 93a46e8..dc09387 100644 --- a/src/req.cpp +++ b/src/req.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/req.hpp b/src/req.hpp index 756cc42..60ee5e7 100644 --- a/src/req.hpp +++ b/src/req.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/select.cpp b/src/select.cpp index 3edd4ff..be5cd47 100644 --- a/src/select.cpp +++ b/src/select.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/select.hpp b/src/select.hpp index 01014d5..01e9fa8 100644 --- a/src/select.hpp +++ b/src/select.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/session.cpp b/src/session.cpp index a17e205..5b5fcb3 100644 --- a/src/session.cpp +++ b/src/session.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/session.hpp b/src/session.hpp index c60cfc7..375d095 100644 --- a/src/session.hpp +++ b/src/session.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/simple_semaphore.hpp b/src/simple_semaphore.hpp index 3342281..78d72e5 100644 --- a/src/simple_semaphore.hpp +++ b/src/simple_semaphore.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/socket_base.cpp b/src/socket_base.cpp index 2348f67..3e6488d 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/socket_base.hpp b/src/socket_base.hpp index 16553ea..1ad9ed1 100644 --- a/src/socket_base.hpp +++ b/src/socket_base.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/stdint.hpp b/src/stdint.hpp index 1be8491..fe1bff6 100644 --- a/src/stdint.hpp +++ b/src/stdint.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/sub.cpp b/src/sub.cpp index b2174c5..bdc27da 100644 --- a/src/sub.cpp +++ b/src/sub.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/sub.hpp b/src/sub.hpp index a7cd134..df7d369 100644 --- a/src/sub.hpp +++ b/src/sub.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp index 9bca0f0..5dcebba 100644 --- a/src/tcp_connecter.cpp +++ b/src/tcp_connecter.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/tcp_connecter.hpp b/src/tcp_connecter.hpp index bb358fd..d397296 100644 --- a/src/tcp_connecter.hpp +++ b/src/tcp_connecter.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/tcp_listener.cpp b/src/tcp_listener.cpp index 11707fb..9087405 100644 --- a/src/tcp_listener.cpp +++ b/src/tcp_listener.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/tcp_listener.hpp b/src/tcp_listener.hpp index 62498dc..1dfe288 100644 --- a/src/tcp_listener.hpp +++ b/src/tcp_listener.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/tcp_socket.cpp b/src/tcp_socket.cpp index 5c7d60d..cc426d7 100644 --- a/src/tcp_socket.cpp +++ b/src/tcp_socket.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/tcp_socket.hpp b/src/tcp_socket.hpp index e71a600..3aae060 100644 --- a/src/tcp_socket.hpp +++ b/src/tcp_socket.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/thread.cpp b/src/thread.cpp index d5b889d..602ca8b 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/thread.hpp b/src/thread.hpp index a1117b2..432770c 100644 --- a/src/thread.hpp +++ b/src/thread.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/upstream.cpp b/src/upstream.cpp index 32de63a..bdcd5ef 100644 --- a/src/upstream.cpp +++ b/src/upstream.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/upstream.hpp b/src/upstream.hpp index 3c82cdb..1e6914b 100644 --- a/src/upstream.hpp +++ b/src/upstream.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/uuid.cpp b/src/uuid.cpp index 6abc41d..6fdb060 100644 --- a/src/uuid.cpp +++ b/src/uuid.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/uuid.hpp b/src/uuid.hpp index e4716de..001ea94 100644 --- a/src/uuid.hpp +++ b/src/uuid.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/windows.hpp b/src/windows.hpp index d765c83..472b9c1 100644 --- a/src/windows.hpp +++ b/src/windows.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/wire.hpp b/src/wire.hpp index 4dbb063..9534cf6 100644 --- a/src/wire.hpp +++ b/src/wire.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/xrep.cpp b/src/xrep.cpp index 4fa250b..4cba21c 100644 --- a/src/xrep.cpp +++ b/src/xrep.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/xrep.hpp b/src/xrep.hpp index 66cb611..67ab02d 100644 --- a/src/xrep.hpp +++ b/src/xrep.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/xreq.cpp b/src/xreq.cpp index 9b95393..a4310f8 100644 --- a/src/xreq.cpp +++ b/src/xreq.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/xreq.hpp b/src/xreq.hpp index fdf8b0f..d0cbb4f 100644 --- a/src/xreq.hpp +++ b/src/xreq.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/yarray.hpp b/src/yarray.hpp index b2d3f1d..8c79b99 100644 --- a/src/yarray.hpp +++ b/src/yarray.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/yarray_item.hpp b/src/yarray_item.hpp index 1de62b8..b6d89cc 100644 --- a/src/yarray_item.hpp +++ b/src/yarray_item.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/ypipe.hpp b/src/ypipe.hpp index 0fb7951..26c50ab 100644 --- a/src/ypipe.hpp +++ b/src/ypipe.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/ypollset.cpp b/src/ypollset.cpp index 0f0d75f..51284a8 100644 --- a/src/ypollset.cpp +++ b/src/ypollset.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/ypollset.hpp b/src/ypollset.hpp index 810a638..c75b149 100644 --- a/src/ypollset.hpp +++ b/src/ypollset.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/yqueue.hpp b/src/yqueue.hpp index 1d3f8e8..45b2b18 100644 --- a/src/yqueue.hpp +++ b/src/yqueue.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq.cpp b/src/zmq.cpp index cce07af..e244171 100644 --- a/src/zmq.cpp +++ b/src/zmq.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. @@ -264,7 +264,7 @@ int zmq_recv (void *s_, zmq_msg_t *msg_, int flags_) return (((zmq::socket_base_t*) s_)->recv (msg_, flags_)); } -int zmq_poll (zmq_pollitem_t *items_, int nitems_) +int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_) { #if defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_FREEBSD ||\ defined ZMQ_HAVE_OPENBSD || defined ZMQ_HAVE_SOLARIS ||\ @@ -321,6 +321,7 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_) npollfds++; } + int timeout = timeout_ > 0 ? timeout_ / 1000 : -1; int nevents = 0; bool initial = true; while (!nevents) { @@ -328,10 +329,16 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_) // Wait for activity. In the first iteration just check for events, // don't wait. Waiting would prevent exiting on any events that may // already be signaled on 0MQ sockets. - int rc = poll (pollfds, npollfds, initial ? 0 : -1); + int rc = poll (pollfds, npollfds, initial ? 0 : timeout); if (rc == -1 && errno == EINTR) continue; errno_assert (rc >= 0); + + // If timeout was hit with no events signaled, return zero. + if (!initial && rc == 0) + return 0; + + // From now on, perform blocking polling. initial = false; // Process 0MQ commands if needed. @@ -426,6 +433,8 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_) maxfd = notify_fd; } + timeval timeout = {timeout_ / 1000000, timeout_ % 1000000}; + timeval zero_timeout = {0, 0}; int nevents = 0; bool initial = true; while (!nevents) { @@ -433,17 +442,21 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_) // Wait for activity. In the first iteration just check for events, // don't wait. Waiting would prevent exiting on any events that may // already be signaled on 0MQ sockets. - timeval timeout = {0, 0}; int rc = select (maxfd, &pollset_in, &pollset_out, &pollset_err, - initial ? &timeout : NULL); + initial ? &zero_timeout : &timeout); #if defined ZMQ_HAVE_WINDOWS wsa_assert (rc != SOCKET_ERROR); #else if (rc == -1 && errno == EINTR) continue; #endif - errno_assert (rc >= 0); + + // If timeout was hit with no events signaled, return zero. + if (!initial && rc == 0) + return 0; + + // From now on, perform blocking select. initial = false; // Process 0MQ commands if needed. diff --git a/src/zmq_connecter.cpp b/src/zmq_connecter.cpp index 8f95fc0..d4c2727 100644 --- a/src/zmq_connecter.cpp +++ b/src/zmq_connecter.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_connecter.hpp b/src/zmq_connecter.hpp index e5b4a70..c3a42a9 100644 --- a/src/zmq_connecter.hpp +++ b/src/zmq_connecter.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_decoder.cpp b/src/zmq_decoder.cpp index b9617fc..cc4f846 100644 --- a/src/zmq_decoder.cpp +++ b/src/zmq_decoder.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_decoder.hpp b/src/zmq_decoder.hpp index 6df2558..5d9133b 100644 --- a/src/zmq_decoder.hpp +++ b/src/zmq_decoder.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_encoder.cpp b/src/zmq_encoder.cpp index 4824cd1..89649ef 100644 --- a/src/zmq_encoder.cpp +++ b/src/zmq_encoder.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_encoder.hpp b/src/zmq_encoder.hpp index 8d4e956..8eedef8 100644 --- a/src/zmq_encoder.hpp +++ b/src/zmq_encoder.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_engine.cpp b/src/zmq_engine.cpp index b568993..40cedfb 100644 --- a/src/zmq_engine.cpp +++ b/src/zmq_engine.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_engine.hpp b/src/zmq_engine.hpp index 63e1539..d26e304 100644 --- a/src/zmq_engine.hpp +++ b/src/zmq_engine.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_init.cpp b/src/zmq_init.cpp index 416e733..c602e1d 100644 --- a/src/zmq_init.cpp +++ b/src/zmq_init.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_init.hpp b/src/zmq_init.hpp index a17d621..414adfe 100644 --- a/src/zmq_init.hpp +++ b/src/zmq_init.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_listener.cpp b/src/zmq_listener.cpp index 6a7e2fd..9ccd82b 100644 --- a/src/zmq_listener.cpp +++ b/src/zmq_listener.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/src/zmq_listener.hpp b/src/zmq_listener.hpp index 899aaf9..6f8cdc9 100644 --- a/src/zmq_listener.hpp +++ b/src/zmq_listener.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. |