Skip to content

Add basic versioning scheme #79

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
haesbaert merged 1 commit into from
Oct 14, 2024
Merged

Add basic versioning scheme #79

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
11 changes: 10 additions & 1 deletion docs/quark-btf.8.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ <h1 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a><
<var class="Ar">btf_file name version</var></td>
</tr>
</table>
<br/>
<table class="Nm">
<tr>
<td><code class="Nm">quark-btf <code class="Fl">-V</code></code></td>
<td></td>
</tr>
</table>
</section>
<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
The <code class="Nm">quark-btf</code> program prints out the kernel structures
Expand Down Expand Up @@ -86,6 +93,8 @@ <h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIP
<dd>Increase
<a class="permalink" href="#quark_verbose"><i class="Em" id="quark_verbose">quark_verbose</i></a>,
can be issued multiple times.</dd>
<dt id="V"><a class="permalink" href="#V"><code class="Fl">-V</code></a></dt>
<dd>Print version and exit.</dd>
</dl>
<section class="Sh">
<h1 class="Sh" id="EXIT_STATUS"><a class="permalink" href="#EXIT_STATUS">EXIT
Expand Down Expand Up @@ -146,7 +155,7 @@ <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
</div>
<table class="foot">
<tr>
<td class="foot-date">October 4, 2024</td>
<td class="foot-date">October 14, 2024</td>
<td class="foot-os">Linux</td>
</tr>
</table>
Expand Down
11 changes: 10 additions & 1 deletion docs/quark-mon.8.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ <h1 class="Sh" id="SYNOPSIS"><a class="permalink" href="#SYNOPSIS">SYNOPSIS</a><
<var class="Ar">maxnodes</var>]</td>
</tr>
</table>
<br/>
<table class="Nm">
<tr>
<td><code class="Nm">quark-mon <code class="Fl">-V</code></code></td>
<td></td>
</tr>
</table>
</section>
<h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
The <code class="Nm">quark-mon</code> program listens to all incoming
Expand Down Expand Up @@ -95,6 +102,8 @@ <h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIP
sorted by time, and the second by pid plus time. Exits after
<var class="Ar">maxnodes</var> has been reached. This is used purely for
internal debugging.</dd>
<dt id="V"><a class="permalink" href="#V"><code class="Fl">-V</code></a></dt>
<dd>Print version and exit.</dd>
</dl>
<section class="Sh">
<h1 class="Sh" id="BACKEND_SELECTION"><a class="permalink" href="#BACKEND_SELECTION">BACKEND
Expand Down Expand Up @@ -161,7 +170,7 @@ <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
</div>
<table class="foot">
<tr>
<td class="foot-date">September 19, 2024</td>
<td class="foot-date">October 14, 2024</td>
<td class="foot-os">Linux</td>
</tr>
</table>
Expand Down
3 changes: 3 additions & 0 deletions quark-btf.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
.Nm quark-btf
.Op Fl v
.Fl g Ar btf_file name version
.Nm quark-btf Fl V
.Sh DESCRIPTION
The
.Nm
Expand Down Expand Up @@ -58,6 +59,8 @@ Matching can be partial.
Increase
.Em quark_verbose ,
can be issued multiple times.
.It Fl V
Print version and exit.
.El
.Sh EXIT STATUS
.Nm
Expand Down
16 changes: 15 additions & 1 deletion quark-btf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@ static int fflag;
static int gflag;
static int lflag;

static void
disply_version(void)
{
printf("%s-%s\n", program_invocation_short_name, QUARK_VERSION);
printf("License: Apache-2.0\n");
printf("Copyright (c) 2024 Elastic NV\n");

exit(0);
}

static void
usage(void)
{
Expand All @@ -27,6 +37,7 @@ usage(void)
program_invocation_short_name);
fprintf(stderr, "usage: %s [-v] [-g btf_file name version]\n",
program_invocation_short_name);
fprintf(stderr, "usage: %s -V\n", program_invocation_short_name);

exit(1);
}
Expand Down Expand Up @@ -218,7 +229,7 @@ main(int argc, char *argv[])
int ch;
const char *path = NULL;

while ((ch = getopt(argc, argv, "bf:glv")) != -1) {
while ((ch = getopt(argc, argv, "bf:glvV")) != -1) {
switch (ch) {
case 'b':
bflag = 1;
Expand All @@ -238,6 +249,9 @@ main(int argc, char *argv[])
case 'v':
quark_verbose++;
break;
case 'V':
disply_version();
break;
default:
usage();
}
Expand Down
3 changes: 3 additions & 0 deletions quark-mon.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
.Op Fl C Ar filename
.Op Fl l Ar maxlength
.Op Fl m Ar maxnodes
.Nm quark-mon Fl V
.Sh DESCRIPTION
The
.Nm
Expand Down Expand Up @@ -82,6 +83,8 @@ Exits after
.Ar maxnodes
has been reached.
This is used purely for internal debugging.
.It Fl V
Print version and exit.
.El
.Sh BACKEND SELECTION
If no backend option is specified,
Expand Down
16 changes: 15 additions & 1 deletion quark-mon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,23 @@ priv_drop(void)
err(1, "error dropping privileges");
}

static void
display_version(void)
{
printf("%s-%s\n", program_invocation_short_name, QUARK_VERSION);
printf("License: Apache-2.0\n");
printf("Copyright (c) 2024 Elastic NV\n");

exit(0);
}

static void
usage(void)
{
fprintf(stderr, "usage: %s [-bDefkstv] "
"[-C filename ] [-l maxlength] [-m maxnodes]\n",
program_invocation_short_name);
fprintf(stderr, "usage: %s -V\n", program_invocation_short_name);

exit(1);
}
Expand All @@ -86,7 +97,7 @@ main(int argc, char *argv[])
nqevs = 32;
graph_by_time = graph_by_pidtime = graph_cache = NULL;

while ((ch = getopt(argc, argv, "bC:Degklm:tsv")) != -1) {
while ((ch = getopt(argc, argv, "bC:Degklm:tsvV")) != -1) {
const char *errstr;

switch (ch) {
Expand Down Expand Up @@ -141,6 +152,9 @@ main(int argc, char *argv[])
case 'v':
quark_verbose++;
break;
case 'V':
display_version();
break;
default:
usage();
}
Expand Down
3 changes: 3 additions & 0 deletions quark.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
#ifndef _QUARK_H_
#define _QUARK_H_

/* Version is shared between library and utilities */
#define QUARK_VERSION "0.1a"

/* Misc types */
#include <stdio.h>

Expand Down