Skip to content

Use copy of bcc_helper.h from performance-diagnositics #27

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

Merged
merged 1 commit into from
Jan 13, 2020
Merged

Use copy of bcc_helper.h from performance-diagnositics #27

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
7 changes: 3 additions & 4 deletions bpf/stbtrace/io.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2019 by Delphix. All rights reserved.
# Copyright (c) 2019, 2020 by Delphix. All rights reserved.
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
Expand All @@ -24,14 +24,13 @@ from bcchelper import BCCHelper


# BPF disk io program
bpf_text = """
bpf_text = '#include "' + base_dir + 'lib/bcc_helper.h' + '"\n'
bpf_text += """
#include <uapi/linux/ptrace.h>
#include <linux/bpf_common.h>
#include <linux/blkdev.h>
#include <linux/blk_types.h>
#include <uapi/linux/bpf.h>
#include "/opt/delphix/server/etc/bcc_helper.h"


// Definitions for this script
#define READ_STR "read"
Expand Down
6 changes: 3 additions & 3 deletions bpf/stbtrace/iscsi.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2019 by Delphix. All rights reserved.
# Copyright (c) 2019, 2020 by Delphix. All rights reserved.
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
Expand All @@ -23,11 +23,11 @@ sys.path.append(base_dir + 'lib/')
from bcchelper import BCCHelper

# BPF txg program
bpf_text = """
bpf_text = '#include "' + base_dir + 'lib/bcc_helper.h' + '"\n'
bpf_text += """
#include <uapi/linux/ptrace.h>
#include <linux/bpf_common.h>
#include <uapi/linux/bpf.h>
#include "/opt/delphix/server/etc/bcc_helper.h"

#include "target/iscsi/iscsi_target_core.h"

Expand Down
6 changes: 3 additions & 3 deletions bpf/stbtrace/nfs.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2019 by Delphix. All rights reserved.
# Copyright (c) 2019, 2020 by Delphix. All rights reserved.
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
Expand All @@ -23,12 +23,12 @@ sys.path.append(base_dir + 'lib/')
from bcchelper import BCCHelper

# BPF txg program
bpf_text = """
bpf_text = '#include "' + base_dir + 'lib/bcc_helper.h' + '"\n'
bpf_text += """
#include <uapi/linux/ptrace.h>
#include <linux/bpf_common.h>
#include <uapi/linux/bpf.h>
#include <linux/sunrpc/svc.h>
#include "/opt/delphix/server/etc/bcc_helper.h"


// nfsd4 definitions from fs/nfsd/xdr4.h
Expand Down
6 changes: 3 additions & 3 deletions bpf/stbtrace/vfs.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2019 by Delphix. All rights reserved.
# Copyright (c) 2019, 2020 by Delphix. All rights reserved.
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
Expand All @@ -23,11 +23,11 @@ sys.path.append(base_dir + 'lib/')
from bcchelper import BCCHelper

# BPF txg program
bpf_text = """
bpf_text = '#include "' + base_dir + 'lib/bcc_helper.h' + '"\n'
bpf_text += """
#include <uapi/linux/ptrace.h>
#include <linux/bpf_common.h>
#include <uapi/linux/bpf.h>
#include "/opt/delphix/server/etc/bcc_helper.h"

// Definitions for this script
#define READ_STR "read"
Expand Down
6 changes: 3 additions & 3 deletions bpf/stbtrace/zio.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2019 by Delphix. All rights reserved.
# Copyright (c) 2019, 2020 by Delphix. All rights reserved.
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
Expand All @@ -23,11 +23,11 @@ sys.path.append(base_dir + 'lib/')
from bcchelper import BCCHelper

# BPF txg program
bpf_text = """
bpf_text = '#include "' + base_dir + 'lib/bcc_helper.h' + '"\n'
bpf_text += """
#include <uapi/linux/ptrace.h>
#include <linux/bpf_common.h>
#include <uapi/linux/bpf.h>
#include "/opt/delphix/server/etc/bcc_helper.h"
#include <sys/zio.h>
#include <sys/fs/zfs.h>

Expand Down
6 changes: 3 additions & 3 deletions bpf/stbtrace/zpl.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2019 by Delphix. All rights reserved.
# Copyright (c) 2019, 2020 by Delphix. All rights reserved.
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
Expand All @@ -23,11 +23,11 @@ sys.path.append(base_dir + 'lib/')
from bcchelper import BCCHelper

# BPF txg program
bpf_text = """
bpf_text = '#include "' + base_dir + 'lib/bcc_helper.h' + '"\n'
bpf_text += """
#include <uapi/linux/ptrace.h>
#include <linux/bpf_common.h>
#include <uapi/linux/bpf.h>
#include "/opt/delphix/server/etc/bcc_helper.h"

#include <sys/uio.h>

Expand Down
4 changes: 2 additions & 2 deletions lib/bcchelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2018, 2019 Delphix. All rights reserved.
# Copyright 2018, 2020 Delphix. All rights reserved.
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
Expand All @@ -16,7 +16,7 @@
https://github.com/iovisor/bcc/blob/master/docs/reference_guide.md#1-bpf

Defitions for C helper routines and macros are in
/opt/delphix/server/etc/bcc_helper.h
lib/bcc_helper.h

BCC Helper focuses are printing out data from a set of tracing aggregations.
There are three supported scalar types of aggregations(count, sum, and
Expand Down