Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
L
libzmq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
libzmq
Commits
72bbc92b
Commit
72bbc92b
authored
Feb 03, 2010
by
Martin Lucina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:sustrik/zeromq2
parents
6502c16a
4172fdd6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
105 additions
and
18 deletions
+105
-18
libzmq.vcproj
builds/msvc/libzmq/libzmq.vcproj
+8
-0
msvc.sln
builds/msvc/msvc.sln
+9
-0
ruby.vcproj
builds/msvc/ruby/ruby.vcproj
+68
-0
pgm_socket.cpp
src/pgm_socket.cpp
+20
-18
No files found.
builds/msvc/libzmq/libzmq.vcproj
View file @
72bbc92b
...
...
@@ -257,6 +257,10 @@
RelativePath=
"..\..\..\src\poll.cpp"
>
</File>
<File
RelativePath=
"..\..\..\src\prefix_tree.cpp"
>
</File>
<File
RelativePath=
"..\..\..\src\pub.cpp"
>
...
...
@@ -511,6 +515,10 @@
RelativePath=
"..\..\..\src\poll.hpp"
>
</File>
<File
RelativePath=
"..\..\..\src\prefix_tree.hpp"
>
</File>
<File
RelativePath=
"..\..\..\src\pub.hpp"
>
...
...
builds/msvc/msvc.sln
View file @
72bbc92b
...
...
@@ -98,6 +98,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zmq_queue", "zmq_queue\zmq_
{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ruby", "ruby\ruby.vcproj", "{A758A62C-48E3-4C30-ACD2-63AA93391D07}"
ProjectSection(ProjectDependencies) = postProject
{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
...
...
@@ -183,6 +188,10 @@ Global
{076F7B8B-5175-4CA9-BC2B-438E37F7F43E}.Debug|Win32.Build.0 = Debug|Win32
{076F7B8B-5175-4CA9-BC2B-438E37F7F43E}.Release|Win32.ActiveCfg = Release|Win32
{076F7B8B-5175-4CA9-BC2B-438E37F7F43E}.Release|Win32.Build.0 = Release|Win32
{A758A62C-48E3-4C30-ACD2-63AA93391D07}.Debug|Win32.ActiveCfg = Debug|Win32
{A758A62C-48E3-4C30-ACD2-63AA93391D07}.Debug|Win32.Build.0 = Debug|Win32
{A758A62C-48E3-4C30-ACD2-63AA93391D07}.Release|Win32.ActiveCfg = Release|Win32
{A758A62C-48E3-4C30-ACD2-63AA93391D07}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
...
...
builds/msvc/ruby/ruby.vcproj
0 → 100644
View file @
72bbc92b
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType=
"Visual C++"
Version=
"9.00"
Name=
"ruby"
ProjectGUID=
"{A758A62C-48E3-4C30-ACD2-63AA93391D07}"
RootNamespace=
"ruby"
TargetFrameworkVersion=
"196613"
>
<Platforms>
<Platform
Name=
"Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name=
"Debug|Win32"
OutputDirectory=
"$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory=
"$(ConfigurationName)"
ConfigurationType=
"10"
CharacterSet=
"2"
>
<Tool
Name=
"VCPreBuildEventTool"
/>
<Tool
Name=
"VCCustomBuildTool"
/>
<Tool
Name=
"VCMIDLTool"
/>
<Tool
Name=
"VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name=
"Release|Win32"
OutputDirectory=
"$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory=
"$(ConfigurationName)"
ConfigurationType=
"10"
UseOfMFC=
"0"
CharacterSet=
"2"
WholeProgramOptimization=
"1"
>
<Tool
Name=
"VCPreBuildEventTool"
CommandLine=
"cd ..\..\..\bindings\ruby
ruby extconf.rb --with-libzmq-include=".\..\..\bindings\c" --with-libzmq-lib=".\..\..\lib"
nmake
mt.exe -manifest librbzmq.so.manifest -outputresource:librbzmq.so;2
nmake install
cd ..\..\builds\msvc\ruby"
/>
<Tool
Name=
"VCCustomBuildTool"
/>
<Tool
Name=
"VCMIDLTool"
/>
<Tool
Name=
"VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
src/pgm_socket.cpp
View file @
72bbc92b
...
...
@@ -78,33 +78,35 @@ int zmq::pgm_socket_t::init (bool udp_encapsulation_, const char *network_)
nbytes_processed
=
0
;
pgm_msgv_processed
=
0
;
int
rc
;
GError
*
pgm_error
=
NULL
;
// Init PGM transport.
// Init PGM transport
if not already done
.
// Ensure threading enabled, ensure timer enabled and find PGM protocol id.
//
// Note that if you want to use gettimeofday and sleep for openPGM timing,
// set environment variables PGM_TIMER to "GTOD"
// and PGM_SLEEP to "USLEEP".
int
rc
=
pgm_init
(
&
pgm_error
);
if
(
rc
!=
TRUE
)
{
if
(
!
pgm_supported
())
{
rc
=
pgm_init
(
&
pgm_error
);
if
(
rc
!=
TRUE
)
{
if
(
pgm_error
->
domain
==
PGM_IF_ERROR
&&
(
pgm_error
->
code
==
PGM_IF_ERROR_INVAL
||
pgm_error
->
code
==
PGM_IF_ERROR_XDEV
||
pgm_error
->
code
==
PGM_IF_ERROR_NODEV
||
pgm_error
->
code
==
PGM_IF_ERROR_NOTUNIQ
||
pgm_error
->
code
==
PGM_IF_ERROR_ADDRFAMILY
||
pgm_error
->
code
==
PGM_IF_ERROR_FAMILY
||
pgm_error
->
code
==
PGM_IF_ERROR_NODATA
||
pgm_error
->
code
==
PGM_IF_ERROR_NONAME
||
pgm_error
->
code
==
PGM_IF_ERROR_SERVICE
))
{
errno
=
EINVAL
;
g_error_free
(
pgm_error
);
return
-
1
;
}
if
(
pgm_error
->
domain
==
PGM_IF_ERROR
&&
(
pgm_error
->
code
==
PGM_IF_ERROR_INVAL
||
pgm_error
->
code
==
PGM_IF_ERROR_XDEV
||
pgm_error
->
code
==
PGM_IF_ERROR_NODEV
||
pgm_error
->
code
==
PGM_IF_ERROR_NOTUNIQ
||
pgm_error
->
code
==
PGM_IF_ERROR_ADDRFAMILY
||
pgm_error
->
code
==
PGM_IF_ERROR_FAMILY
||
pgm_error
->
code
==
PGM_IF_ERROR_NODATA
||
pgm_error
->
code
==
PGM_IF_ERROR_NONAME
||
pgm_error
->
code
==
PGM_IF_ERROR_SERVICE
))
{
errno
=
EINVAL
;
g_error_free
(
pgm_error
);
return
-
1
;
zmq_assert
(
false
);
}
zmq_assert
(
false
);
}
// PGM transport GSI.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment