my $env_ok = $self->check_env($env_vars);
if ($env_ok) {
- return $env_vars->{SAMBA_PID};
+ return $env_vars->{SAMBA_PID};
+ } elsif (defined($env_vars->{SAMBA_PID})) {
+ warn("SAMBA PID $env_vars->{SAMBA_PID} is not running (died)");
+ return undef;
}
# use a pipe for stdin in the child processes. This allows
sub getlog_env($$)
{
my ($self, $envvars) = @_;
- my $title = "SAMBA LOG of: $envvars->{NETBIOSNAME}\n";
+ my $title = "SAMBA LOG of: $envvars->{NETBIOSNAME} pid $envvars->{SAMBA_PID}\n";
my $out = $title;
open(LOG, "<$envvars->{SAMBA_TEST_LOG}");
const char *binary_name = (const char *)private_data;
uint8_t c;
if (read(0, &c, 1) == 0) {
- DEBUG(0,("%s: EOF on stdin - terminating\n", binary_name));
+ DEBUG(0,("%s: EOF on stdin - PID %d terminating\n", binary_name, (int)getpid()));
#if HAVE_GETPGRP
if (getpgrp() == getpid()) {
DEBUG(0,("Sending SIGTERM from pid %d\n", (int)getpid()));
struct timeval t, void *private_data)
{
const char *binary_name = (const char *)private_data;
- DEBUG(0,("%s: maximum runtime exceeded - terminating at %llu, current ts: %llu\n",
- binary_name, (unsigned long long)t.tv_sec, (unsigned long long) time(NULL)));
+ DEBUG(0,("%s: maximum runtime exceeded - terminating PID %d at %llu, current ts: %llu\n",
+ binary_name, (int)getpid(), (unsigned long long)t.tv_sec, (unsigned long long) time(NULL)));
exit(0);
}
static NTSTATUS samba_terminate(struct irpc_message *msg,
struct samba_terminate *r)
{
- DEBUG(0,("samba_terminate: %s\n", r->in.reason));
+ DEBUG(0,("samba_terminate of %d: %s\n",
+ (int)getpid(), r->in.reason));
exit(1);
}
}
if (max_runtime) {
- DEBUG(0,("Called with maxruntime %d - current ts %llu\n",
- max_runtime, (unsigned long long) time(NULL)));
+ DEBUG(0,("%s PID %d was called with maxruntime %d - current ts %llu\n",
+ binary_name, (int)getpid(),
+ max_runtime, (unsigned long long) time(NULL)));
tevent_add_timer(event_ctx, event_ctx,
timeval_current_ofs(max_runtime, 0),
max_runtime_handler,