Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nghttp2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
nghttp2
Commits
73f55e7b
Commit
73f55e7b
authored
Mar 04, 2014
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h2load: Fix crash with multi threading
parent
13be30e5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
121 additions
and
0 deletions
+121
-0
src/Makefile.am
src/Makefile.am
+1
-0
src/h2load.cc
src/h2load.cc
+3
-0
src/ssl.cc
src/ssl.cc
+74
-0
src/ssl.h
src/ssl.h
+43
-0
No files found.
src/Makefile.am
View file @
73f55e7b
...
...
@@ -70,6 +70,7 @@ nghttpd_SOURCES = ${HELPER_OBJECTS} ${HELPER_HFILES} nghttpd.cc \
HttpServer.cc HttpServer.h
h2load_SOURCES
=
util.cc util.h http2.cc http2.h h2load.cc h2load.h
\
ssl.cc ssl.h
\
h2load_session.h
\
h2load_http2_session.cc h2load_http2_session.h
...
...
src/h2load.cc
View file @
73f55e7b
...
...
@@ -50,6 +50,7 @@
#ifdef HAVE_SPDYLAY
#include "h2load_spdy_session.h"
#endif // HAVE_SPDYLAY
#include "ssl.h"
#include "http2.h"
#include "util.h"
...
...
@@ -684,6 +685,8 @@ int main(int argc, char **argv)
SSL_load_error_strings
();
SSL_library_init
();
ssl
::
LibsslGlobalLock
();
http_parser_url
u
;
memset
(
&
u
,
0
,
sizeof
(
u
));
auto
uri
=
argv
[
optind
];
...
...
src/ssl.cc
0 → 100644
View file @
73f55e7b
/*
* nghttp2 - HTTP/2.0 C Library
*
* Copyright (c) 2014 Tatsuhiro Tsujikawa
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "ssl.h"
#include <cassert>
#include <vector>
#include <mutex>
#include <iostream>
#include <openssl/crypto.h>
namespace
nghttp2
{
namespace
ssl
{
namespace
{
std
::
vector
<
std
::
mutex
>
ssl_global_locks
;
}
// namespace
namespace
{
void
ssl_locking_cb
(
int
mode
,
int
type
,
const
char
*
file
,
int
line
)
{
if
(
mode
&
CRYPTO_LOCK
)
{
ssl_global_locks
[
type
].
lock
();
}
else
{
ssl_global_locks
[
type
].
unlock
();
}
}
}
// namespace
LibsslGlobalLock
::
LibsslGlobalLock
()
{
if
(
!
ssl_global_locks
.
empty
())
{
std
::
cerr
<<
"OpenSSL global lock has been already set"
<<
std
::
endl
;
assert
(
0
);
}
ssl_global_locks
=
std
::
vector
<
std
::
mutex
>
(
CRYPTO_num_locks
());
// CRYPTO_set_id_callback(ssl_thread_id); OpenSSL manual says that
// if threadid_func is not specified using
// CRYPTO_THREADID_set_callback(), then default implementation is
// used. We use this default one.
CRYPTO_set_locking_callback
(
ssl_locking_cb
);
}
LibsslGlobalLock
::~
LibsslGlobalLock
()
{
ssl_global_locks
.
clear
();
}
}
// namespace ssl
}
// namespace nghttp2
src/ssl.h
0 → 100644
View file @
73f55e7b
/*
* nghttp2 - HTTP/2.0 C Library
*
* Copyright (c) 2012 Tatsuhiro Tsujikawa
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "nghttp2_config.h"
namespace
nghttp2
{
namespace
ssl
{
// Acquire OpenSSL global lock to share SSL_CTX across multiple
// threads. The constructor acquires lock and destructor unlocks.
class
LibsslGlobalLock
{
public:
LibsslGlobalLock
();
~
LibsslGlobalLock
();
LibsslGlobalLock
(
const
LibsslGlobalLock
&
)
=
delete
;
LibsslGlobalLock
&
operator
=
(
const
LibsslGlobalLock
&
)
=
delete
;
};
}
// namespace ssl
}
// namespace nghttp2
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