cebc409da6
Summary: We currently give sonar one event base from java / obj-c code to use for scheduling tasks. This causes a problem, because we schedule reconnect tasks on the event base, and then these tasks interact with rsocket which schedules it's own tasks. The problem is that we're passing rsocket the same event base. So the reconnect code executes and blocks waiting for rsocket to connect. But rsocket can never connect because it never executes because that thread is blocked, so we get deadlock. This is the first step which just changes the interface to pass two event bases. The consumers will be changed to pass in different threads next. Reviewed By: danielbuechele Differential Revision: D8748350 fbshipit-source-id: 481d6f23644f28fd0f1c786252605287019c999c
46 lines
883 B
C++
46 lines
883 B
C++
/*
|
|
* Copyright (c) 2018-present, Facebook, Inc.
|
|
*
|
|
* This source code is licensed under the MIT license found in the LICENSE
|
|
* file in the root directory of this source tree.
|
|
*
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <folly/io/async/EventBase.h>
|
|
#include <map>
|
|
|
|
namespace facebook {
|
|
namespace sonar {
|
|
|
|
struct DeviceData {
|
|
std::string host;
|
|
std::string os;
|
|
std::string device;
|
|
std::string deviceId;
|
|
std::string app;
|
|
std::string appId;
|
|
std::string privateAppDirectory;
|
|
};
|
|
|
|
struct SonarInitConfig {
|
|
/**
|
|
Map of client specific configuration data such as app name, device name, etc.
|
|
*/
|
|
DeviceData deviceData;
|
|
|
|
/**
|
|
EventBase on which client callbacks should be called.
|
|
*/
|
|
folly::EventBase* callbackWorker;
|
|
|
|
/**
|
|
EventBase to be used to maintain the network connection.
|
|
*/
|
|
folly::EventBase* connectionWorker;
|
|
};
|
|
|
|
} // namespace sonar
|
|
} // namespace facebook
|