Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb42757_worker_thread' into 'master'
Move synchronous mode switch activity to worker thread

See merge request mer-core/usb-moded!37
  • Loading branch information
spiiroin committed Sep 6, 2018
2 parents 461747e + 054e8e0 commit 50370d4
Show file tree
Hide file tree
Showing 46 changed files with 3,352 additions and 2,319 deletions.
240 changes: 158 additions & 82 deletions .depend

Large diffs are not rendered by default.

29 changes: 29 additions & 0 deletions Makefile.custom
Expand Up @@ -169,10 +169,13 @@ LDLIBS += $(PKG_LDLIBS)
# ----------------------------------------------------------------------------

usb_moded-OBJS += src/usb_moded.o

usb_moded-OBJS += src/usb_moded-android.o
usb_moded-OBJS += src/usb_moded-appsync.o
usb_moded-OBJS += src/usb_moded-common.o
usb_moded-OBJS += src/usb_moded-config.o
usb_moded-OBJS += src/usb_moded-configfs.o
usb_moded-OBJS += src/usb_moded-control.o
usb_moded-OBJS += src/usb_moded-dbus.o
usb_moded-OBJS += src/usb_moded-devicelock.o
usb_moded-OBJS += src/usb_moded-dsme.o
Expand All @@ -182,10 +185,12 @@ usb_moded-OBJS += src/usb_moded-mac.o
usb_moded-OBJS += src/usb_moded-modesetting.o
usb_moded-OBJS += src/usb_moded-modules.o
usb_moded-OBJS += src/usb_moded-network.o
usb_moded-OBJS += src/usb_moded-sigpipe.o
usb_moded-OBJS += src/usb_moded-ssu.o
usb_moded-OBJS += src/usb_moded-systemd.o
usb_moded-OBJS += src/usb_moded-trigger.o
usb_moded-OBJS += src/usb_moded-udev.o
usb_moded-OBJS += src/usb_moded-worker.o

usb_moded : $(usb_moded-OBJS)
$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
Expand Down Expand Up @@ -217,8 +222,10 @@ usb_moded_util : $(usb_moded_util-OBJS)
CLEAN_SOURCES += src/usb_moded-android.c
CLEAN_SOURCES += src/usb_moded-appsync-dbus.c
CLEAN_SOURCES += src/usb_moded-appsync.c
CLEAN_SOURCES += src/usb_moded-common.c
CLEAN_SOURCES += src/usb_moded-config.c
CLEAN_SOURCES += src/usb_moded-configfs.c
CLEAN_SOURCES += src/usb_moded-control.c
CLEAN_SOURCES += src/usb_moded-dbus.c
CLEAN_SOURCES += src/usb_moded-devicelock.c
CLEAN_SOURCES += src/usb_moded-dsme.c
Expand All @@ -228,11 +235,13 @@ CLEAN_SOURCES += src/usb_moded-mac.c
CLEAN_SOURCES += src/usb_moded-modesetting.c
CLEAN_SOURCES += src/usb_moded-modules.c
CLEAN_SOURCES += src/usb_moded-network.c
CLEAN_SOURCES += src/usb_moded-sigpipe.c
CLEAN_SOURCES += src/usb_moded-ssu.c
CLEAN_SOURCES += src/usb_moded-systemd.c
CLEAN_SOURCES += src/usb_moded-trigger.c
CLEAN_SOURCES += src/usb_moded-udev.c
CLEAN_SOURCES += src/usb_moded-util.c
CLEAN_SOURCES += src/usb_moded-worker.c
CLEAN_SOURCES += src/usb_moded.c
CLEAN_SOURCES += utils/udev-search.c

Expand All @@ -241,8 +250,10 @@ CLEAN_HEADERS += src/usb_moded-appsync-dbus-private.h
CLEAN_HEADERS += src/usb_moded-appsync-dbus.h
CLEAN_HEADERS += src/usb_moded-appsync.h
CLEAN_HEADERS += src/usb_moded-config-private.h
CLEAN_HEADERS += src/usb_moded-common.h
CLEAN_HEADERS += src/usb_moded-config.h
CLEAN_HEADERS += src/usb_moded-configfs.h
CLEAN_HEADERS += src/usb_moded-control.h
CLEAN_HEADERS += src/usb_moded-dbus-private.h
CLEAN_HEADERS += src/usb_moded-dbus.h
CLEAN_HEADERS += src/usb_moded-devicelock.h
Expand All @@ -254,10 +265,12 @@ CLEAN_HEADERS += src/usb_moded-modes.h
CLEAN_HEADERS += src/usb_moded-modesetting.h
CLEAN_HEADERS += src/usb_moded-modules.h
CLEAN_HEADERS += src/usb_moded-network.h
CLEAN_HEADERS += src/usb_moded-sigpipe.h
CLEAN_HEADERS += src/usb_moded-ssu.h
CLEAN_HEADERS += src/usb_moded-systemd.h
CLEAN_HEADERS += src/usb_moded-trigger.h
CLEAN_HEADERS += src/usb_moded-udev.h
CLEAN_HEADERS += src/usb_moded-worker.h
CLEAN_HEADERS += src/usb_moded.h

# Files with whitespace issues
Expand Down Expand Up @@ -326,3 +339,19 @@ clean::

distclean::
$(RM) -r RPMS installroot

.SUFFIXES: %.trim
.PRECIOUS: %.trim

include_trim:: include_trim_headers include_trim_sources

%.trim : %
find_unneeded_includes.py $(CPPFLAGS) $(CFLAGS) -- $<
touch $@

include_trim_headers: $(patsubst %,%.trim,$(ALL_HEADERS))

include_trim_sources: $(patsubst %,%.trim,$(ALL_SOURCES))

distclean::
$(RM) *.trim */*.trim
11 changes: 10 additions & 1 deletion src/Makefile.am
@@ -1,4 +1,5 @@
USB_MODED_CFLAGS += -D_GNU_SOURCE
USB_MODED_LIBS += -lpthread

sbin_PROGRAMS = usb_moded \
usb_moded_util
Expand All @@ -24,6 +25,8 @@ usb_moded_SOURCES = \
usb_moded-modules.h \
usb_moded-log.h \
usb_moded-log.c \
usb_moded-common.c \
usb_moded-common.h \
usb_moded-config.c \
usb_moded-config.h \
usb_moded-network.c \
Expand All @@ -39,8 +42,14 @@ usb_moded_SOURCES = \
usb_moded-modules.c \
usb_moded-configfs.c \
usb_moded-configfs.h \
usb_moded-worker.h \
usb_moded-worker.c \
usb_moded-android.h \
usb_moded-android.c
usb_moded-android.c \
usb_moded-sigpipe.h \
usb_moded-sigpipe.c \
usb_moded-control.h \
usb_moded-control.c

if USE_MER_SSU
usb_moded_SOURCES += \
Expand Down
14 changes: 6 additions & 8 deletions src/usb_moded-android.c
Expand Up @@ -21,19 +21,17 @@
* 02110-1301 USA
*/

#include <stdio.h>
#include <glib.h>

#include "usb_moded.h"
#include "usb_moded-android.h"
#include "usb_moded-log.h"
#include "usb_moded-modesetting.h"

#include "usb_moded-config-private.h"
#include "usb_moded-log.h"
#include "usb_moded-mac.h"
#include "usb_moded-modesetting.h"

#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>

/* ========================================================================= *
* Functions
Expand Down
1 change: 1 addition & 0 deletions src/usb_moded-android.h
Expand Up @@ -25,6 +25,7 @@
# define USB_MODED_ANDROID_H_

# include <stdbool.h>
# include <glib.h>

/* ========================================================================= *
* Constants
Expand Down
4 changes: 3 additions & 1 deletion src/usb_moded-appsync-dbus-private.h
Expand Up @@ -25,7 +25,9 @@
#ifndef USB_MODED_APPSYNC_DBUS_PRIVATE_H_
# define USB_MODED_APPSYNC_DBUS_PRIVATE_H_

#include "usb_moded-appsync-dbus.h"
# include "usb_moded-appsync-dbus.h" // NOTRIM

# include <glib.h>

/* ========================================================================= *
* Prototypes
Expand Down
18 changes: 6 additions & 12 deletions src/usb_moded-appsync-dbus.c
Expand Up @@ -25,20 +25,14 @@
* 02110-1301 USA
*/

#include <stdio.h>
#include "usb_moded-appsync-dbus-private.h"

#include "usb_moded-appsync.h"
#include "usb_moded-log.h"

#include <string.h>

#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>

#include "usb_moded-dbus-private.h"
#include "usb_moded.h"
#include "usb_moded-log.h"
#include "usb_moded-modes.h"
#include "usb_moded-config-private.h"
#include "usb_moded-appsync.h"
#include "usb_moded-appsync-dbus-private.h"

/* ========================================================================= *
* Prototypes
Expand Down Expand Up @@ -183,7 +177,7 @@ static DBusHandlerResult dbusappsync_msg_handler(DBusConnection *const connectio
// could not parse method call args
reply = dbus_message_new_error(msg, DBUS_ERROR_INVALID_ARGS, member);
}
else if( appsync_mark_active(use) < 0 )
else if( appsync_mark_active(use, 1) < 0 )
{
// name could not be marked active
reply = dbus_message_new_error(msg, DBUS_ERROR_INVALID_ARGS, member);
Expand Down

0 comments on commit 50370d4

Please sign in to comment.