← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mir/utopic-proposed

« back to all changes in this revision

Viewing changes to src/server/frontend/published_socket_connector.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-03-10 19:28:46 UTC
  • mto: This revision was merged to the branch mainline in revision 63.
  • Revision ID: package-import@ubuntu.com-20140310192846-rq9qm3ec26yrelo2
Tags: upstream-0.1.6+14.04.20140310
Import upstream version 0.1.6+14.04.20140310

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/frontend/published_socket_connector.cpp
35
35
    const std::string& socket_file,
36
36
    std::shared_ptr<SessionCreator> const& session_creator,
37
37
    int threads,
38
 
    std::function<void()> const& force_threads_to_unblock,
39
38
    std::shared_ptr<ConnectorReport> const& report)
40
 
:   BasicConnector(session_creator, threads, force_threads_to_unblock, report),
 
39
:   BasicConnector(session_creator, threads, report),
41
40
    socket_file(socket_file),
42
41
    acceptor(io_service, socket_file)
43
42
{
83
82
mf::BasicConnector::BasicConnector(
84
83
    std::shared_ptr<SessionCreator> const& session_creator,
85
84
    int threads,
86
 
    std::function<void()> const& force_threads_to_unblock,
87
85
    std::shared_ptr<ConnectorReport> const& report)
88
86
:   work(io_service),
89
87
    report(report),
90
88
    io_service_threads(threads),
91
 
    force_threads_to_unblock(force_threads_to_unblock),
92
89
    session_creator{session_creator}
93
90
{
94
91
}
123
120
    /* Stop processing new requests */
124
121
    io_service.stop();
125
122
 
126
 
    /*
127
 
     * Ensure that any pending requests will complete (i.e., that they
128
 
     * will not block indefinitely waiting for a resource from the server)
129
 
     */
130
 
    force_threads_to_unblock();
131
 
 
132
123
    report->stopping_threads(io_service_threads.size());
133
124
 
134
125
    /* Wait for all io processing threads to finish */
181
172
    stop();
182
173
}
183
174
 
184
 
void mf::NullConnectorReport::thread_start()
185
 
{
186
 
}
187
 
 
188
 
void mf::NullConnectorReport::thread_end()
189
 
{
190
 
}
191
 
 
192
 
void mf::NullConnectorReport::starting_threads(int /*count*/)
193
 
{
194
 
}
195
 
 
196
 
void mf::NullConnectorReport::stopping_threads(int /*count*/)
197
 
{
198
 
}
199
 
 
200
 
void mf::NullConnectorReport::creating_session_for(int /*socket_handle*/)
201
 
{
202
 
}
203
 
 
204
 
void mf::NullConnectorReport::creating_socket_pair(int /*server_handle*/, int /*client_handle*/)
205
 
{
206
 
}
207
 
 
208
 
void mf::NullConnectorReport::listening_on(std::string const& /*endpoint*/)
209
 
{
210
 
}
211
 
 
212
 
void mf::NullConnectorReport::error(std::exception const& /*error*/)
213
 
{
214
 
}