[PATCH weston 2/3] launcher: Split out launcher implementations into three distinct ones

[Pekka Paalanen]

On Thu, 24 Sep 2015 13:51:10 +0300
Pekka Paalanen <ppaalanen at gmail.com> wrote:

> On Wed, 23 Sep 2015 13:42:13 -0500
> Derek Foreman <derekf at osg.samsung.com> wrote:
> 
> > On 23/09/15 12:46 PM, Jasper St. Pierre wrote:
> > > We now have a launcher interface and distinct implementations for
> > > logind, weston-launch, and direct DRM, each in their own files.
> > > 
> > > This helps up clean up the spaghetti code into something that's
> > > hopefully a bit more understood. There should be no functional
> > > changes here.
> > > ---
> > >  Makefile.am                  |   7 +-
> > >  src/launcher-direct.c        | 315 +++++++++++++++++++++++++++++++
> > >  src/launcher-impl.h          |  45 +++++
> > >  src/launcher-logind.c        | 154 +++++++++------
> > >  src/launcher-logind.h        | 123 ------------
> > >  src/launcher-util.c          | 441 ++++---------------------------------------
> > >  src/launcher-weston-launch.c | 302 +++++++++++++++++++++++++++++
> > >  7 files changed, 796 insertions(+), 591 deletions(-)
> > >  create mode 100644 src/launcher-direct.c
> > >  create mode 100644 src/launcher-impl.h
> > >  delete mode 100644 src/launcher-logind.h
> > >  create mode 100644 src/launcher-weston-launch.c
> 
> > I like the series, seems a nice clean up/refactor to me.
> > 
> > With the double free fixed, the whole thing is
> > Reviewed-by: Derek Foreman <derekf at osg.samsung.com>
> 
> Hi,
> 
> after this patch, when started with weston-launch set as suid-root,
> Weston dies with:
> 
> Date: 2015-09-24 EEST
> [13:43:21.370] weston 1.9.90
>                http://wayland.freedesktop.org
>                Bug reports to: https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=weston&version=1.9.90
>                Build: 1.9.0-15-g72dea06-dirty launcher: Split out launcher implementations into three distinct ones (2015-09-23 15:47:48 -0700)
> [13:43:21.370] OS: Linux, 3.15.0, #1 SMP PREEMPT Fri Jun 13 11:57:27 EEST 2014, x86_64
> [13:43:21.370] Using config file '/home/pq/local/etc/weston.ini'
> [13:43:21.370] Loading module '/home/pq/local/lib/weston/drm-backend.so'
> [13:43:21.372] Output repaint window is 7 ms maximum.
> [13:43:21.372] initializing drm backend
> [13:43:21.372] fatal: drm backend should be run using weston-launch binary or as root
> [13:43:21.372] fatal: failed to create compositor backend
> 
> This is on a system where there is no systemd at all.
> 
> Tested by checking out 72dea06d7952e3ce8dd8057f7106186da4fa2678 which
> fails. The previous commit 30bcf35ceba29f070bc8eb7286e9b89eb85405be
> works.
> 
> Not sure I'll have time to investigate soon.

This patch also makes distcheck fail:

../../src/launcher-util.c:32:27: fatal error: launcher-impl.h: No such file or directory
compilation terminated.
Makefile:4389: recipe for target 'src/libsession_helper_la-launcher-util.lo' failed
make[2]: *** [src/libsession_helper_la-launcher-util.lo] Error 1
make[2]: *** Waiting for unfinished jobs....
../../src/launcher-weston-launch.c:45:27: fatal error: launcher-impl.h: No such file or directory
compilation terminated.
Makefile:4396: recipe for target 'src/libsession_helper_la-launcher-weston-launch.lo' failed
make[2]: *** [src/libsession_helper_la-launcher-weston-launch.lo] Error 1
../../src/launcher-direct.c:38:27: fatal error: launcher-impl.h: No such file or directory
compilation terminated.
Makefile:4403: recipe for target 'src/libsession_helper_la-launcher-direct.lo' failed
make[2]: *** [src/libsession_helper_la-launcher-direct.lo] Error 1


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 811 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/wayland-devel/attachments/20150924/25211ae6/attachment.sig>