Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Link umockdev-record with libumockdev #148

Closed
wants to merge 1 commit into from
Closed

Link umockdev-record with libumockdev #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,9 @@ umockdev_run_exe = executable('umockdev-run',
install: true)

umockdev_record_exe = executable('umockdev-record',
['src/umockdev-record.vala',
'src/umockdev-ioctl.vala',
'src/umockdev-pcap.vala',
'src/umockdev-spi.vala',
'src/ioctl_tree.vapi',
'src/ioctl_tree.c',
'src/debug.c'],
['src/umockdev-record.vala'],
dependencies: [glib, gobject, gio_unix, vapi_posix, vapi_config, vapi_ioctl, libpcap],
link_with: [umockdev_utils_lib],
link_with: [umockdev_utils_lib, umockdev_lib],
vala_args: [ '--vapidir=@0@/src'.format(meson.current_source_dir()) ],
include_directories: include_directories('src'),
install: true)
Expand Down
8 changes: 4 additions & 4 deletions src/umockdev-ioctl.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ public class IoctlBase: GLib.Object {
listeners.remove(devnode);
}

internal void register_path(GLib.MainContext? ctx, string devnode, string sockpath)
public void register_path(GLib.MainContext? ctx, string devnode, string sockpath)
{
assert(DirUtils.create_with_parents(Path.get_dirname(sockpath), 0755) == 0);

Expand All @@ -768,13 +768,13 @@ public class IoctlBase: GLib.Object {
ctx.invoke(tmp.cb);
}

internal void unregister_path(string devnode)
public void unregister_path(string devnode)
{
lock (listeners)
listeners[devnode].cancel();
}

internal void unregister_all()
public void unregister_all()
{
lock (listeners) {
listeners.foreach((key, val) => {
Expand Down Expand Up @@ -895,7 +895,7 @@ internal class IoctlTreeHandler : IoctlBase {
}
}

internal class IoctlTreeRecorder : IoctlBase {
public class IoctlTreeRecorder : IoctlBase {

bool write_log;
string logfile;
Expand Down
4 changes: 2 additions & 2 deletions src/umockdev-spi.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private struct TransferChunk {
bool cont;
}

internal abstract class IoctlSpiBase : IoctlBase {
public abstract class IoctlSpiBase : IoctlBase {

internal long iter_ioctl_vector(ulong count, IoctlData data, bool for_recording) {
long transferred = 0;
Expand Down Expand Up @@ -325,7 +325,7 @@ internal class IoctlSpiHandler : IoctlSpiBase {
}
}

internal class IoctlSpiRecorder : IoctlSpiBase {
public class IoctlSpiRecorder : IoctlSpiBase {

bool cs_is_high;
Posix.FILE log;
Expand Down