Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

problem: srcfd is broken and unneeded as we have metadata #1953

Merged
merged 2 commits into from
May 4, 2016

Conversation

somdoron
Copy link
Member

@somdoron somdoron commented May 4, 2016

PR solve the broken SRCFD by using metadata to store the file descriptor.
However as we now have metadata which include the peer address we don't need the SRCFD, therefore marked SRCFD as deprecated. If someone need more metadata I suggest adding it instead of using the SRCFD.

Fixes #1950

@@ -86,8 +86,7 @@ int zmq::msg_t::init ()
u.vsm.flags = 0;
u.vsm.size = 0;
u.vsm.group[0] = '\0';
u.vsm.routing_id = 0;
u.vsm.fd = retired_fd;
u.vsm.routing_id = 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's trailing whitespace here and in other places below - want to fix before merge? or in a new PR?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will fix it, this is what happen when I'm using visual studio :-(

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok I'll wait then, thanks!

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.09%) to 74.898% when pulling 48467e6 on somdoron:master into a192663 on zeromq:master.

@@ -137,8 +134,7 @@ int zmq::msg_t::init_external_storage(content_t* content_, void* data_, size_t s
u.zclmsg.flags = 0;
u.zclmsg.group[0] = '\0';
u.zclmsg.routing_id = 0;
u.zclmsg.fd = retired_fd;


Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed one :-)

@somdoron
Copy link
Member Author

somdoron commented May 4, 2016

@bluca should be good now

@bluca bluca merged commit feec476 into zeromq:master May 4, 2016
@somdoron somdoron changed the title problem: src is broken and unneeded as we have metadata problem: srcfd is broken and unneeded as we have metadata May 4, 2016
@bluca
Copy link
Member

bluca commented May 4, 2016

Mmh OSX (or rather Clang) is not happy:

../src/stream_engine.cpp:990:62: error: cannot take the address of an rvalue of type 'std::__1::basic_ostringstream<char, std::__1::char_traits<char>, std::__1::allocator<char> >'
    std::string fd_string = static_cast<std::ostringstream*>(&(std::ostringstream() << (int)s))->str();

Do you have Clang available to give it a look?

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.07%) to 74.923% when pulling ba20f66 on somdoron:master into a192663 on zeromq:master.

@somdoron
Copy link
Member Author

somdoron commented May 4, 2016

I have osx vm, checking...

@somdoron
Copy link
Member Author

somdoron commented May 4, 2016

fixed #1954

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants