Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-08-27 14:57:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

syslog: Use self-contained recursive mutex

Browse Source 
Update #2843.
This commit is contained in:
Sebastian Huber
2018-02-07 08:58:31 +01:00
parent 3535439f5c
commit 2aa5b98c32
1 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/libnetworking/lib/syslog.c
+6 -24
View File
@@ -7,6 +7,7 @@
#endif
#include <rtems.h>
#include <rtems/thread.h>
#include <stdio.h>
#include <stdarg.h>
#include <errno.h>
@@ -24,7 +25,8 @@ static int LogFacility = LOG_USER;
static int LogMask = 0xff;
static int LogFd = -1;
static rtems_id LogSemaphore;
static rtems_recursive_mutex LogSemaphore =
RTEMS_RECURSIVE_MUTEX_INITIALIZER("syslog");
extern struct in_addr rtems_bsdnet_log_host_address;
#define SYSLOG_PORT 514
@@ -89,8 +91,7 @@ vsyslog (int pri, const char *fmt, va_list ap)
*/
sent = 0;
if ((rtems_bsdnet_log_host_address.s_addr != INADDR_ANY)
&& (LogFd >= 0)
&& (rtems_semaphore_obtain (LogSemaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT) == RTEMS_SUCCESSFUL)) {
&& (LogFd >= 0)) {
/*
* Set the destination address/port
*/
@@ -100,12 +101,13 @@ vsyslog (int pri, const char *fmt, va_list ap)
farAddress.sin_addr = rtems_bsdnet_log_host_address;
memset (farAddress.sin_zero, '\0', sizeof farAddress.sin_zero);
rtems_recursive_mutex_lock (&LogSemaphore);
/*
* Send the message
*/
if (sendto (LogFd, cbuf, cnt, 0, (struct sockaddr *)&farAddress, sizeof farAddress) >= 0)
sent = 1;
rtems_semaphore_release (LogSemaphore);
rtems_recursive_mutex_unlock (&LogSemaphore);
}
if (!sent && (LogStatus & LOG_CONS) && !(LogStatus & LOG_PERROR))
printf ("%s\n", msgp);
@@ -114,7 +116,6 @@ vsyslog (int pri, const char *fmt, va_list ap)
void
openlog (const char *ident, int logstat, int logfac)
{
rtems_status_code sc;
struct sockaddr_in myAddress;
if (ident != NULL)
@@ -144,24 +145,6 @@ openlog (const char *ident, int logstat, int logfac)
printf ("Can't bind syslog socket: %d\n", errno);
return;
}
/*
* Create the mutex
*/
sc = rtems_semaphore_create (rtems_build_name('s', 'L', 'o', 'g'),
1,
RTEMS_PRIORITY |
RTEMS_BINARY_SEMAPHORE |
RTEMS_INHERIT_PRIORITY |
RTEMS_NO_PRIORITY_CEILING |
RTEMS_LOCAL,
0,
&LogSemaphore);
if (sc != RTEMS_SUCCESSFUL) {
printf ("Can't create syslog semaphore: %d\n", sc);
close (LogFd);
LogFd = -1;
}
}
void
@@ -170,7 +153,6 @@ closelog(void)
if (LogFd >= 0) {
close (LogFd);
LogFd = -1;
rtems_semaphore_delete (LogSemaphore);
}
}