Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
JAliEn
JAliEn-ROOT
Commits
bdf7f812
Commit
bdf7f812
authored
Jun 18, 2019
by
Nikola Hardi
Committed by
Volodymyr Yurchenko
Jun 18, 2019
Browse files
Fix cling genreflex
parent
aff0f2c3
Pipeline
#925942
passed with stage
in 2 minutes and 13 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
inc/TJAlien.h
View file @
bdf7f812
...
...
@@ -38,8 +38,7 @@
#include
"TJAlienResult.h"
#include
<TLockFile.h>
#ifndef __CINT__
#include
<curl/curl.h>
#if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__ROOTCLING__) && !defined(__CLING__)
#include
<json-c/json.h>
#else
struct
json_object
;
...
...
@@ -62,9 +61,12 @@ typedef char int8_t;
#include
<string>
#include
<signal.h>
#include
<sys/stat.h>
#if !defined(__CINT__) && !defined(__MAKECINT__)
#if !defined(__CINT__) && !defined(__MAKECINT__)
&& !defined(__ROOTCLING__) && !defined(__CLING__)
#include
<libwebsockets.h>
#include
"lws_config.h"
#else
struct
lws_context
;
struct
lws_context_creation_info
;
#endif
#if (SSLEAY_VERSION_NUMBER >= 0x0907000L)
...
...
@@ -119,25 +121,26 @@ private:
TJAlienResult
*
GetCommandResult
(
json_object
*
json_response
);
// Libwebsockets
struct
lws_context_creation_info
creation_info
;
// Info to create logical connection
struct
lws_context
*
context
;
// Context contains all information about connection
struct
lws
*
wsi
;
// WebSocket Instance - real connection object, created basing on context
static
int
destroy_flag
;
// Flags to know connection status
static
int
connection_flag
;
static
int
writeable_flag
;
static
int
receive_flag
;
struct
lws_context
*
context
;
// Context contains all information about connection
/* struct lws_context_creation_info creation_info; // Info to create logical connection */
struct
lws
*
wsi
;
// WebSocket Instance - real connection object, created basing on context
struct
session_data
{
// Needed by protocol, TODO: clarify if can be replaced by just int var
int
fd
;
};
#if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__ROOTCLING__) && !defined(__CLING__)
static
int
ws_service_callback
(
// Callback to handle connection
struct
lws
*
wsi
,
enum
lws_callback_reasons
reason
,
void
*
user
,
void
*
in
,
size_t
len
);
// lws_write helper
static
int
websocket_write_back
(
struct
lws
*
wsi_in
,
const
char
*
str
,
int
str_size_in
);
#endif
virtual
TGridResult
*
OpenDataset
(
const
char
*
lfn
,
const
char
*
options
=
""
);
const
char
*
Whoami
();
...
...
src/TJAlien.cxx
View file @
bdf7f812
...
...
@@ -178,6 +178,7 @@ void TJAlien::MakeWebsocketConnection(TJAlienCredentialsObject creds, string hos
// libwebsockets variables
struct
lws_client_connect_info
connect_info
;
struct
lws_context_creation_info
creation_info
;
// Info to create logical connection
memset
(
&
connect_info
,
0
,
sizeof
connect_info
);
memset
(
&
creation_info
,
0
,
sizeof
creation_info
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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