Skip to content

Commit 72f82cc

Browse files
Merge PR #16: Log the right slave program name
2 parents f5bbe54 + a544802 commit 72f82cc

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

ossp-alsap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ int main(int argc, char **argv)
572572
{
573573
int rc;
574574

575-
ossp_slave_init(argc, argv);
575+
ossp_slave_init("ossp-alsap", argc, argv);
576576

577577
page_size = sysconf(_SC_PAGE_SIZE);
578578

ossp-padsp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1534,7 +1534,7 @@ int main(int argc, char **argv)
15341534
{
15351535
int rc;
15361536

1537-
ossp_slave_init(argc, argv);
1537+
ossp_slave_init("ossp-padsp", argc, argv);
15381538

15391539
page_size = sysconf(_SC_PAGE_SIZE);
15401540

ossp-slave.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ int ossp_cmd_fd = -1, ossp_notify_fd = -1;
3838
void *ossp_mmap_addr[2];
3939
struct ossp_transfer *ossp_mmap_transfer;
4040

41-
void ossp_slave_init(int argc, char **argv)
41+
void ossp_slave_init(const char *slave_name, int argc, char **argv)
4242
{
4343
int have_uid = 0, have_gid = 0;
4444
uid_t uid;
@@ -91,8 +91,8 @@ void ossp_slave_init(int argc, char **argv)
9191
snprintf(ossp_user_name, sizeof(ossp_user_name), "%s",
9292
pw->pw_name);
9393

94-
snprintf(ossp_log_name, sizeof(ossp_log_name), "ossp-padsp[%s:%d]",
95-
ossp_user_name, getpid());
94+
snprintf(ossp_log_name, sizeof(ossp_log_name), "%s[%s:%d]",
95+
slave_name, ossp_user_name, getpid());
9696

9797
if (mmap_fd >= 0) {
9898
void *p;

ossp-slave.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ extern int ossp_cmd_fd, ossp_notify_fd;
1717
extern void *ossp_mmap_addr[2];
1818
extern struct ossp_transfer *ossp_mmap_transfer;
1919

20-
void ossp_slave_init(int argc, char **argv);
20+
void ossp_slave_init(const char *slave_name, int argc, char **argv);
2121
int ossp_slave_process_command(int cmd_fd,
2222
ossp_action_fn_t const *action_fn_tbl,
2323
int (*action_pre_fn)(void),

0 commit comments

Comments
 (0)