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

Add support ATOPACCTDIR env variable #71

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support ATOPACCTDIR env variable #71

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
79 changes: 59 additions & 20 deletions acctproc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,12 @@
#include "atopacctd.h"

#define ACCTDIR "/var/cache/atop.d"
#define ACCTDIRENV "ATOPACCTDIR"
#define ACCTFILE "atop.acct"
#define ACCTENV "ATOPACCT"

static char *acctdir = ACCTDIR;

static char acctatop; /* boolean: atop's own accounting busy ? */
static off_t acctsize; /* previous size of account file */
static int acctrecsz; /* size of account record */
Expand Down Expand Up @@ -249,6 +252,19 @@ acctswon(void)
}
}

/*
** when a particular environment variable is present, atop should
** use a specific directory for accounting-file (as defined by the environment
** variable)
*/
if ( (ep = getenv(ACCTDIRENV)) && *ep)
{
acctdir = ep;
}

char acctfilepath[128];
snprintf(acctfilepath, sizeof acctfilepath, "%s/%s", acctdir, ACCTFILE);

/*
** when the atopacctd daemon is active on this system,
** it should be the preferred way to read the accounting records
Expand Down Expand Up @@ -435,16 +451,16 @@ acctswon(void)
** if this directory exists (e.g. previous atop-run killed)
** it will be cleaned and newly created
*/
if ( mkdir(ACCTDIR, 0700) == -1)
if ( mkdir(acctdir, 0700) == -1)
{
if (errno == EEXIST)
{
(void) acct(0);
(void) unlink(ACCTDIR "/" ACCTFILE);
(void) rmdir(ACCTDIR);
(void) unlink(acctfilepath);
(void) rmdir(acctdir);
}

if ( mkdir(ACCTDIR, 0700) == -1)
if ( mkdir(acctdir, 0700) == -1)
{
/*
** persistent failure
Expand All @@ -453,19 +469,18 @@ acctswon(void)
return 4;
}
}

/*
** create accounting file in new directory
*/
(void) close( creat(ACCTDIR "/" ACCTFILE, 0600) );
(void) close( creat( acctfilepath, 0600) );

/*
** switch on accounting
*/
if ( acct(ACCTDIR "/" ACCTFILE) < 0)
if ( acct( acctfilepath ) < 0)
{
(void) unlink(ACCTDIR "/" ACCTFILE);
(void) rmdir(ACCTDIR);
(void) unlink(acctfilepath);
(void) rmdir(acctdir);
(void) semop(sematopid, &semrelse, 1);

return 5;
Expand All @@ -476,11 +491,11 @@ acctswon(void)
** accounting is switched on now;
** open accounting-file
*/
if ( (acctfd = open(ACCTDIR "/" ACCTFILE, O_RDONLY) ) < 0)
if ( (acctfd = open(acctfilepath, O_RDONLY) ) < 0)
{
(void) acct(0);
(void) unlink(ACCTDIR "/" ACCTFILE);
(void) rmdir(ACCTDIR);
(void) unlink(acctfilepath);
(void) rmdir(acctdir);

(void) semop(sematopid, &semrelse, 1);
return 1;
Expand All @@ -501,8 +516,8 @@ acctswon(void)
{
(void) acct(0);
(void) close(acctfd);
(void) unlink(ACCTDIR "/" ACCTFILE);
(void) rmdir(ACCTDIR);
(void) unlink(acctfilepath);
(void) rmdir(acctdir);

acctfd = -1;
return 1;
Expand All @@ -524,8 +539,8 @@ acctswon(void)
{
(void) acct(0);
(void) close(acctfd);
(void) unlink(ACCTDIR "/" ACCTFILE);
(void) rmdir(ACCTDIR);
(void) unlink(acctfilepath);
(void) rmdir(acctdir);

acctfd = -1;
return 1;
Expand Down Expand Up @@ -635,14 +650,24 @@ acctswoff(void)

if (after.st_size > before.st_size)
{

char *ep;
if ( (ep = getenv(ACCTDIRENV)) && *ep)
{
acctdir = ep;
}

char acctfilepath[128];
snprintf(acctfilepath, sizeof acctfilepath, "%s/%s", acctdir, ACCTFILE);

/*
** remove the directory and file
*/
regainrootprivs(); /* get root privs again */

(void) acct(0);
(void) unlink(ACCTDIR "/" ACCTFILE);
(void) rmdir(ACCTDIR);
(void) unlink(acctfilepath);
(void) rmdir(acctdir);

if (! droprootprivs() )
mcleanstop(42,
Expand Down Expand Up @@ -982,10 +1007,24 @@ acctrestarttrial()

(void) acct(0); // switch off accounting

if ( truncate(ACCTDIR "/" ACCTFILE, 0) == 0)
/*
** when a particular environment variable is present, atop should
** use a specific directory for accounting-file (as defined by the environment
** variable)
*/
char *ep;
if ( (ep = getenv(ACCTDIRENV)) && *ep)
{
acctdir = ep;
}

char acctfilepath[128];
snprintf(acctfilepath, sizeof acctfilepath, "%s/%s", acctdir, ACCTFILE);

if ( truncate(acctfilepath, 0) == 0)
(void) lseek(acctfd, 0, SEEK_SET);

(void) acct(ACCTDIR "/" ACCTFILE);
(void) acct(acctfilepath);

if (! droprootprivs() )
mcleanstop(42, "failed to drop root privs\n");
Expand Down
4 changes: 4 additions & 0 deletions man/atop.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ will never read more than 50 MiB with process information from the
process accounting file per interval (approx. 70000 finished processes).
In interactive mode a warning is given whenever processes have been skipped
for this reason.

When the environment variable ATOPACCTDIR set and not empty, it specifies directory for process accounting file instead of
.I /var/cache/atop.d
which set by default.
.PP
.SH COLORS
For the resource consumption on system level,
Expand Down