--- freem/src/transact.c 2025/03/24 02:54:47 1.5 +++ freem/src/transact.c 2025/04/15 18:19:40 1.11 @@ -1,5 +1,5 @@ /* - * $Id: transact.c,v 1.5 2025/03/24 02:54:47 snw Exp $ + * $Id: transact.c,v 1.11 2025/04/15 18:19:40 snw Exp $ * FreeM transaction processing support * * @@ -24,6 +24,24 @@ * along with FreeM. If not, see . * * $Log: transact.c,v $ + * Revision 1.11 2025/04/15 18:19:40 snw + * Further attempts to fix FreeBSD + * + * Revision 1.10 2025/04/15 16:49:36 snw + * Make use of logprintf throughout codebase + * + * Revision 1.9 2025/04/13 04:22:43 snw + * Fix snprintf calls + * + * Revision 1.8 2025/04/10 01:24:39 snw + * Remove C++ style comments + * + * Revision 1.7 2025/04/09 19:52:02 snw + * Eliminate as many warnings as possible while building with -Wall + * + * Revision 1.6 2025/03/24 04:13:12 snw + * Replace action macro dat with fra_dat to avoid symbol conflict on OS/2 + * * Revision 1.5 2025/03/24 02:54:47 snw * Transaction compat fixes for OS/2 * @@ -49,6 +67,7 @@ #include "shmmgr.h" #include "mref.h" #include "tp_check.h" +#include "log.h" #define FALSE 0 #define TRUE 1 @@ -63,8 +82,6 @@ union semun { }; #endif -void m_log (int, const char *); - int semid_tp; int tp_committing = FALSE; int tp_level = 0; @@ -74,7 +91,6 @@ tp_transaction transactions[TP_MAX_NEST] void tp_init(void) { union semun arg; - char err[255]; key_t tp_sk; tp_sk = ftok (config_file, 4); @@ -82,15 +98,17 @@ void tp_init(void) if (first_process) { semid_tp = semget (tp_sk, 1, 0666 | IPC_CREAT); + if (semid_tp == -1) { - fprintf (stderr, "tp_init: failed to create transaction processing semaphore [errno %d]\r\n", errno); - exit (1); + logprintf (FM_LOG_FATAL, "tp_init: failed to create transaction processing semaphore [%s]", strerror (errno)); + } + else { + logprintf (FM_LOG_INFO, "tp_init: got semaphore id %d", semid_tp); } arg.val = 1; if (semctl (semid_tp, 0, SETVAL, arg) == -1) { - fprintf (stderr, "tp_init: failed to initialize transaction processing semaphore\r\n"); - exit (1); + logprintf (FM_LOG_FATAL, "tp_init: failed to initialize transaction processing semaphore [%s]", strerror (errno)); } } @@ -98,8 +116,7 @@ void tp_init(void) semid_tp = semget (tp_sk, 1, 0); if (semid_tp == -1) { - fprintf (stderr, "tp_init: could not attach to transaction processing semaphore [errno %d]\r\n", errno); - exit (1); + logprintf (FM_LOG_FATAL, "tp_init: could not attach to transaction processing semaphore [%s]", strerror (errno)); } } @@ -115,19 +132,17 @@ short tp_get_sem(void) char msgbuf[100]; - snprintf (msgbuf, 99, "tp_get_sem: process %d attempting to acquire transaction processing semaphore", pid); - m_log (1, msgbuf); + logprintf (FM_LOG_INFO, "tp_get_sem: process %d attempting to acquire transaction processing semaphore", pid); /* our process already owns the semaphore */ if (shm_config->hdr->tp_owner == pid) { - snprintf (msgbuf, 99, "tp_get_sem: process %d increments transaction processing semaphore counter", pid); - m_log (1, msgbuf); + logprintf (FM_LOG_INFO, "tp_get_sem: process %ld increments transaction processing semaphore counter", pid); if (first_process == TRUE) { - fprintf (stderr, "tp_get_sem: daemon process increments critical section counter\r\n"); + logprintf (FM_LOG_INFO, "tp_get_sem: daemon process increments critical section counter"); } @@ -137,7 +152,7 @@ short tp_get_sem(void) } if (first_process == TRUE) { - fprintf (stderr, "tp_get_sem: daemon process enters critical section\r\n"); + logprintf (FM_LOG_INFO, "tp_get_sem: daemon process enters critical section"); } @@ -147,20 +162,16 @@ short tp_get_sem(void) shm_config->hdr->tp_owner = pid; shm_config->hdr->tp_semctr = 1; - snprintf (msgbuf, 99, "tp_get_sem: process %d takes transaction processing semaphore", pid); - m_log (1, msgbuf); - + logprintf (FM_LOG_INFO, "tp_get_sem: process %ld takes transaction processing semaphore", pid); if (first_process == TRUE) { - fprintf (stderr, "tp_get_sem: daemon process takes transaction processing semaphore\r\n"); + logprintf (FM_LOG_INFO, "tp_get_sem: daemon process takes transaction processing semaphore"); } return TRUE; } - snprintf (msgbuf, 99, "tp_get_sem: process %d attempting to acquire transaction processing semaphore (tries = %d)", pid, tries); - m_log (1, msgbuf); - + logprintf (FM_LOG_WARNING, "tp_get_sem: process %ld retries attempting to acquire transaction processing semaphore (tries = %d)", pid, tries); sleep (1); @@ -180,7 +191,7 @@ void tp_release_sem(void) struct sembuf s = {0, 1, 0}; if (first_process == TRUE) { - fprintf (stderr, "tp_release_sem: daemon process leaves critical section\r\n"); + logprintf (FM_LOG_INFO, "tp_release_sem: daemon process leaves critical section"); } @@ -188,13 +199,11 @@ void tp_release_sem(void) shm_config->hdr->tp_owner = 0; if (first_process == TRUE) { - fprintf (stderr, "tp_release_sem: daemon process relinquishes transaction processing semaphore\r\n"); + logprintf (FM_LOG_INFO, "tp_release_sem: daemon process relinquishes transaction processing semaphore"); } - snprintf (msgbuf, 99, "tp_get_sem: process %d releases transaction processing semaphore", pid); - m_log (1, msgbuf); - + logprintf (FM_LOG_INFO, "tp_get_sem: process %ld releases transaction processing semaphore", pid); semop (semid_tp, &s, 1); @@ -202,11 +211,10 @@ void tp_release_sem(void) else { if (first_process == TRUE) { - fprintf (stderr, "tp_release_sem: daemon process decrements critical section counter\r\n"); + logprintf (FM_LOG_INFO, "tp_release_sem: daemon process decrements critical section counter"); } - snprintf (msgbuf, 99, "tp_get_sem: process %d decrements transaction processing semaphore counter", pid); - m_log (1, msgbuf); + logprintf (FM_LOG_INFO, "tp_get_sem: process %d decrements transaction processing semaphore counter", pid); shm_config->hdr->tp_semctr--; } @@ -219,8 +227,7 @@ int tp_tstart(char *tp_id, short serial, if (tp_level == TP_MAX_NEST) { char m[256]; - snprintf (m, 256, "Attempt to exceed TP_MAX_NEST. Transaction aborted.\r\n\201"); - write_m (m); + logprintf (FM_LOG_ERROR, "Attempt to exceed TP_MAX_NEST. Transaction aborted."); return FALSE; } @@ -243,8 +250,7 @@ int tp_tstart(char *tp_id, short serial, } else { - fprintf (stderr, "tp_tstart: could not get transaction processing semaphore\r\n"); - exit (1); + logprintf (FM_LOG_FATAL, "tp_tstart: could not get transaction processing semaphore"); } @@ -264,8 +270,7 @@ int tp_add_op(short islock, short action if (transactions[tp_level].opcount == TP_MAX_OPS) { char m[256]; - snprintf (m, 256, "Attempt to exceed TP_MAX_OPS at transaction level %d. Rolling back.\r\n\201", tp_level); - write_m (m); + logprintf (FM_LOG_ERROR, "attempt to exceed TP_MAX_OPS at transaction level %d; rolling back", tp_level); free (gr); @@ -382,7 +387,6 @@ int tp_trollback(int levels) register int i; register int j; -// for (i = 0; i < levels; i++) { for (i = tp_level; i >= (((tp_level - levels) >= 0) ? tp_level - levels : 0); i--) { for (j = 1; j <= transactions[i].opcount; j++) { @@ -493,7 +497,7 @@ void tp_get_op_name(char *buf, const sho strcpy (buf, "GET"); break; - case dat: + case fra_dat: strcpy (buf, "$DATA"); break;