Author: fabient
Date: Thu Mar 11 07:36:45 2010
New Revision: 204999
URL: http://svn.freebsd.org/changeset/base/204999
Log:
MFC r204878:
Change the way shutdown is handled for log file.
pmc_flush_logfile is now non-blocking and just ask the kernel
to shutdown the file. From that point, no more data is
accepted by the log thread and when the last buffer is flushed
the file is closed.
This will remove a deadlock between pmcstat asking for
flush while it cannot flush the pipe itself.
Modified:
stable/8/usr.sbin/pmcstat/pmcstat_log.c
Directory Properties:
stable/8/usr.sbin/pmcstat/ (props changed)
Modified: stable/8/usr.sbin/pmcstat/pmcstat_log.c
==============================================================================
--- stable/8/usr.sbin/pmcstat/pmcstat_log.c Thu Mar 11 07:35:30 2010
(r204998)
+++ stable/8/usr.sbin/pmcstat/pmcstat_log.c Thu Mar 11 07:36:45 2010
(r204999)
@@ -1670,10 +1670,8 @@ pmcstat_print_log(void)
int
pmcstat_close_log(void)
{
- if (pmc_flush_logfile() < 0 ||
- pmc_configure_logfile(-1) < 0)
+ if (pmc_flush_logfile() < 0)
err(EX_OSERR, "ERROR: logging failed");
- args.pa_flags &= ~(FLAG_HAS_OUTPUT_LOGFILE | FLAG_HAS_PIPE);
return (args.pa_flags & FLAG_HAS_PIPE ? PMCSTAT_EXITING :
PMCSTAT_FINISHED);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
