Skip to content

Commit

Permalink
#1266: support multiple pulseaudio servers per user
Browse files Browse the repository at this point in the history 
git-svn-id: https://xpra.org/svn/Xpra/trunk@18103 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
@totaam
totaam committed Jan 22, 2018
1 parent 2d7958d commit ed1db47
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 16 deletions.
4 changes: 3 additions & 1 deletion src/xpra/platform/features.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@
"--exit-idle-time=-1", "--load=module-suspend-on-idle",
"'--load=module-null-sink sink_name=\"Xpra-Speaker\" sink_properties=device.description=\"Xpra\\ Speaker\"'",
"'--load=module-null-sink sink_name=\"Xpra-Microphone\" sink_properties=device.description=\"Xpra\\ Microphone\"'",
"--load=module-native-protocol-unix",
"'--load=module-native-protocol-unix socket=$XPRA_PULSE_SERVER'",
"--enable-memfd=no",
"--load=module-dbus-protocol",
"--load=module-x11-publish",
"--log-level=2", "--log-target=stderr"]
DEFAULT_PULSEAUDIO_CONFIGURE_COMMANDS = [
["pactl", "set-default-sink", "Xpra-Speaker"],
Expand Down
91 changes: 76 additions & 15 deletions src/xpra/server/server_base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
from xpra.server.control_command import ArgsControlCommand, ControlError
from xpra.simple_stats import to_std_unit, std_unit
from xpra.child_reaper import getChildReaper
from xpra.os_util import BytesIOClass, thread, livefds, load_binary_file, pollwait, monotonic_time, bytestostr, OSX, WIN32, POSIX, PYTHON3
from xpra.os_util import BytesIOClass, thread, livefds, load_binary_file, pollwait, monotonic_time, bytestostr, osexpand, OSX, WIN32, POSIX, PYTHON3
from xpra.util import typedict, flatten_dict, updict, envbool, envint, log_screen_sizes, engs, repr_ellipsized, csv, iround, detect_leaks, \
SERVER_EXIT, SERVER_ERROR, SERVER_SHUTDOWN, DETACH_REQUEST, NEW_CLIENT, DONE, IDLE_TIMEOUT, SESSION_BUSY
from xpra.net.bytestreams import set_socket_timeout
Expand All @@ -55,6 +55,7 @@
unicode = str #@ReservedAssignment


PRIVATE_PULSEAUDIO = envbool("XPRA_PRIVATE_PULSEAUDIO", POSIX and not OSX)
DETECT_MEMLEAKS = envbool("XPRA_DETECT_MEMLEAKS", False)
DETECT_FDLEAKS = envbool("XPRA_DETECT_FDLEAKS", False)
MAX_CONCURRENT_CONNECTIONS = 20
Expand Down Expand Up @@ -163,6 +164,8 @@ def __init__(self):
self.pulseaudio_command = None
self.pulseaudio_configure_commands = []
self.pulseaudio_proc = None
self.pulseaudio_private_dir = None
self.pulseaudio_private_socket = None
self.sound_properties = typedict()

#encodings:
Expand Down Expand Up @@ -513,21 +516,45 @@ def init_pulseaudio(self):
soundlog("init_pulseaudio() pulseaudio=%s, pulseaudio_command=%s", self.pulseaudio, self.pulseaudio_command)
if self.pulseaudio is False:
return
#make sure that the sound subprocess will use the devices
#we define in the pulseaudio command
#(it is too difficult to parse the pulseaudio_command,
# so we just hope that it matches this):
#Note: speaker is the source and microphone the sink,
# because things are reversed on the server.
if not self.pulseaudio_command:
soundlog.warn("Warning: pulseaudio command is not defined")
return
#environment initialization:
# 1) make sure that the sound subprocess will use the devices
# we define in the pulseaudio command
# (it is too difficult to parse the pulseaudio_command,
# so we just hope that it matches this):
# Note: speaker is the source and microphone the sink,
# because things are reversed on the server.
os.environ.update({
"XPRA_PULSE_SOURCE_DEVICE_NAME" : "Xpra-Speaker",
"XPRA_PULSE_SINK_DEVICE_NAME" : "Xpra-Microphone",
})
if not self.pulseaudio_command:
soundlog.warn("Warning: pulseaudio command is not defined")
return
# 2) whitelist the env vars that pulseaudio may use:
PA_ENV_WHITELIST = ("DBUS_SESSION_BUS_ADDRESS", "DBUS_SESSION_BUS_PID", "DBUS_SESSION_BUS_WINDOWID",
"DISPLAY", "HOME", "HOSTNAME", "LANG", "PATH",
"PWD", "SHELL", "XAUTHORITY",
"XDG_CURRENT_DESKTOP", "XDG_SESSION_TYPE",
"XPRA_PULSE_SOURCE_DEVICE_NAME", "XPRA_PULSE_SINK_DEVICE_NAME",
)
env = dict((k,v) for k,v in self.get_child_env().items() if k in PA_ENV_WHITELIST)
# 3) use a private pulseaudio server, so each xpra
# session can have its own server,
# create a directory for each display:
if PRIVATE_PULSEAUDIO:
from xpra.platform.xposix.paths import _get_xpra_runtime_dir
xpra_rd = _get_xpra_runtime_dir()
if xpra_rd:
display = os.environ.get("DISPLAY")
self.pulseaudio_private_dir = osexpand(os.path.join(xpra_rd, "pulse-%s" % display))
if not os.path.exists(self.pulseaudio_private_dir):
os.mkdir(self.pulseaudio_private_dir, 0o700)
env["XDG_RUNTIME_DIR"] = self.pulseaudio_private_dir
self.pulseaudio_private_socket = os.path.join(self.pulseaudio_private_dir, "pulse", "native")
os.environ["XPRA_PULSE_SERVER"] = self.pulseaudio_private_socket
import shlex
cmd = shlex.split(self.pulseaudio_command)
cmd = list(osexpand(x) for x in cmd)
#find the absolute path to the command:
pa_cmd = cmd[0]
if not os.path.isabs(pa_cmd):
Expand Down Expand Up @@ -564,9 +591,10 @@ def pulseaudio_ended(proc):
soundlog.warn("Warning: the pulseaudio server process has terminated after %i seconds", int(elapsed))
self.pulseaudio_proc = None
import subprocess
env = self.get_child_env()
try:
self.pulseaudio_proc = subprocess.Popen(cmd, stdin=None, env=env, shell=True, close_fds=True)
log.info("cmd=%s", " ".join(cmd))
log.info("env=%s", env)
self.pulseaudio_proc = subprocess.Popen(cmd, stdin=None, env=env, shell=False, close_fds=True)
except Exception as e:
soundlog("Popen(%s)", cmd, exc_info=True)
soundlog.error("Error: failed to start pulseaudio:")
Expand All @@ -575,6 +603,10 @@ def pulseaudio_ended(proc):
self.add_process(self.pulseaudio_proc, "pulseaudio", cmd, ignore=True, callback=pulseaudio_ended)
if self.pulseaudio_proc:
soundlog.info("pulseaudio server started with pid %s", self.pulseaudio_proc.pid)
if self.pulseaudio_private_socket:
soundlog.info(" private server socket path:")
soundlog.info(" '%s'", self.pulseaudio_private_socket)
os.environ["PULSE_SERVER"] = "unix:%s" % self.pulseaudio_private_socket
def configure_pulse():
p = self.pulseaudio_proc
if p is None or p.poll() is not None:
Expand All @@ -588,7 +620,7 @@ def cleanup_pulseaudio(self):
proc = self.pulseaudio_proc
if not proc:
return
soundlog("cleanup_pa() process.poll()=%s, pid=%s", proc.poll(), proc.pid)
soundlog.warn("cleanup_pa() process.poll()=%s, pid=%s", proc.poll(), proc.pid)
if self.is_child_alive(proc):
self.pulseaudio_proc = None
soundlog.info("stopping pulseaudio with pid %s", proc.pid)
Expand All @@ -601,14 +633,30 @@ def cleanup_pulseaudio(self):
r = pollwait(proc)
#warning: pactl will return 0 whether it succeeds or not...
#but we can't kill the process because Ubuntu starts a new one
if r!=0:
if r!=0 and self.is_child_alive(proc):
#fallback to using SIGINT:
proc.terminate()
except Exception as e:
soundlog("cleanup_pulseaudio() error stopping %s", proc, exc_info=True)
soundlog.warn("cleanup_pulseaudio() error stopping %s", proc, exc_info=True)
#only log the full stacktrace if the process failed to terminate:
if self.is_child_alive(proc):
soundlog.error("Error: stopping pulseaudio: %s", e, exc_info=True)
try:
if self.pulseaudio_private_socket and os.path.exists(self.pulseaudio_private_socket):
try:
os.unlink(self.pulseaudio_private_socket)
except Exception as e:
soundlog("failed to remove private socket '%s'", self.pulseaudio_private_socket, exc_info=True)
if self.pulseaudio_private_dir:
pulse = os.path.join(self.pulseaudio_private_dir, "pulse")
native = os.path.join(self.pulseaudio_private_dir, "pulse", "native")
for x in (native, pulse, self.pulseaudio_private_dir):
soundlog.warn("removing private directory '%s'", x)
if os.path.exists(x) and os.path.isdir(x):
os.rmdir(x)
except Exception as e:
soundlog("cleanup_pulseaudio() error cleaning up private directory", exc_info=True)


def init_sound_options(self, opts):
self.supports_speaker = sound_option(opts.speaker) in ("on", "off")
Expand Down Expand Up @@ -2379,11 +2427,24 @@ def get_info(self, proto=None, client_uuids=None, wids=None, *_args):
info.setdefault("cursor", {}).update({"size" : self.cursor_size})
info.setdefault("sound", self.sound_properties)
info.setdefault("commands", self.get_commands_info())
if self.pulseaudio:
info.setdefault("pulseaudio", {}).update(self.get_pulseaudio_info())
if self.notifications_forwarder:
info.setdefault("notifications", {}).update(self.notifications_forwarder.get_info())
log("ServerBase.get_info took %.1fms", 1000.0*(monotonic_time()-start))
return info

def get_pulseaudio_info(self):
info = {
"command" : self.pulseaudio_command,
"configure-commands" : self.pulseaudio_configure_commands,
}
if self.pulseaudio_proc and self.pulseaudio_proc.poll() is None:
info["pid"] = self.pulseaudio_proc.pid
if self.pulseaudio_private_dir and self.pulseaudio_private_socket:
info["private-directory"] = self.pulseaudio_private_dir
info["private-socket"] = self.pulseaudio_private_socket

def get_printing_info(self):
d = {
"lpadmin" : self.lpadmin,
Expand Down

0 comments on commit ed1db47

Please sign in to comment.