aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-14 11:13:39 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-16 11:08:18 +0100
commit31d63946dff548746343b54a5fa356a16bbe3c5c (patch)
treec1f7b6af8ee6d9a694506946183f4fe4eeb760f2
parentc0e0728a24602dda1f08e34240f677c0640a202d (diff)
downloadpaludis-31d63946dff548746343b54a5fa356a16bbe3c5c.tar.gz
paludis-31d63946dff548746343b54a5fa356a16bbe3c5c.tar.xz
IPCInputManager's exclusivity does nothing
-rw-r--r--paludis/ipc_output_manager.cc8
-rw-r--r--paludis/ipc_output_manager.hh1
-rw-r--r--src/clients/cave/cmd_execute_resolution.cc12
3 files changed, 7 insertions, 14 deletions
diff --git a/paludis/ipc_output_manager.cc b/paludis/ipc_output_manager.cc
index 632d52f..7054e12 100644
--- a/paludis/ipc_output_manager.cc
+++ b/paludis/ipc_output_manager.cc
@@ -181,7 +181,6 @@ namespace paludis
struct Implementation<IPCInputManager>
{
const Environment * const env;
- const OutputExclusivity exclusivity;
const std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)> on_create;
mutable Mutex mutex;
@@ -191,10 +190,9 @@ namespace paludis
std::tr1::shared_ptr<Thread> copy_thread;
- Implementation(const Environment * const e, const OutputExclusivity x,
+ Implementation(const Environment * const e,
const std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)> & c) :
env(e),
- exclusivity(x),
on_create(c)
{
if (0 != ::fcntl(finished_pipe.read_fd(), F_SETFD, FD_CLOEXEC))
@@ -209,9 +207,9 @@ namespace paludis
};
}
-IPCInputManager::IPCInputManager(const Environment * const e, const OutputExclusivity x,
+IPCInputManager::IPCInputManager(const Environment * const e,
const std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)> & c) :
- PrivateImplementationPattern<IPCInputManager>(new Implementation<IPCInputManager>(e, x, c))
+ PrivateImplementationPattern<IPCInputManager>(new Implementation<IPCInputManager>(e, c))
{
}
diff --git a/paludis/ipc_output_manager.hh b/paludis/ipc_output_manager.hh
index 80afe52..5bff624 100644
--- a/paludis/ipc_output_manager.hh
+++ b/paludis/ipc_output_manager.hh
@@ -65,7 +65,6 @@ namespace paludis
public:
IPCInputManager(
const Environment * const,
- const OutputExclusivity,
const std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)> &);
~IPCInputManager();
diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc
index d596163..1d6d055 100644
--- a/src/clients/cave/cmd_execute_resolution.cc
+++ b/src/clients/cave/cmd_execute_resolution.cc
@@ -181,8 +181,7 @@ namespace
a != a_end ; ++a)
command = command + " " + args::escape(*a);
- IPCInputManager input_manager(env.get(), oe_exclusive,
- std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)>());
+ IPCInputManager input_manager(env.get(), std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)>());
paludis::Command cmd(command);
cmd
.with_pipe_command_handler("PALUDIS_IPC", input_manager.pipe_command_handler())
@@ -291,8 +290,7 @@ namespace
command.append(" --" + cmdline.import_options.a_unpackaged_repository_params.long_name() + " '" + *p + "'");
}
- IPCInputManager input_manager(env.get(), oe_exclusive,
- std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)>());
+ IPCInputManager input_manager(env.get(), std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)>());
paludis::Command cmd(command);
cmd
.with_pipe_command_handler("PALUDIS_IPC", input_manager.pipe_command_handler())
@@ -396,8 +394,7 @@ namespace
command.append(" --" + cmdline.import_options.a_unpackaged_repository_params.long_name() + " '" + *p + "'");
}
- IPCInputManager input_manager(env.get(), oe_exclusive,
- std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)>());
+ IPCInputManager input_manager(env.get(), std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)>());
paludis::Command cmd(command);
cmd
.with_pipe_command_handler("PALUDIS_IPC", input_manager.pipe_command_handler())
@@ -473,8 +470,7 @@ namespace
command.append(" --" + cmdline.import_options.a_unpackaged_repository_params.long_name() + " '" + *p + "'");
}
- IPCInputManager input_manager(env.get(), oe_exclusive,
- std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)>());
+ IPCInputManager input_manager(env.get(), std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)>());
paludis::Command cmd(command);
cmd
.with_pipe_command_handler("PALUDIS_IPC", input_manager.pipe_command_handler())