freem/src/frmgbl.c - diff

Return to frmgbl.c CVS log

Up to [Coherent Logic Development] / freem / src

Diff for /freem/src/frmgbl.c between versions 1.12 and 1.15

version 1.12, 2025/04/16 17:36:12	version 1.15, 2025/04/30 14:41:03
Line 24	Line 24
* along with FreeM. If not, see <https://www.gnu.org/licenses/>.	* along with FreeM. If not, see <https://www.gnu.org/licenses/>.
*	*
* $Log$	* $Log$
	* Revision 1.15 2025/04/30 14:41:03 snw
	* Further debugger work
	*
	* Revision 1.14 2025/04/28 19:38:55 snw
	* Add trace mode
	*
	* Revision 1.13 2025/04/17 14:34:27 snw
	* Further logging improvements
	*
* Revision 1.12 2025/04/16 17:36:12 snw	* Revision 1.12 2025/04/16 17:36:12 snw
* Add FreeBSD shm cleanup script	* Add FreeBSD shm cleanup script
*	*
Line 64	Line 73
#include <string.h>	#include <string.h>
#include <sys/types.h>	#include <sys/types.h>
#include <sys/wait.h>	#include <sys/wait.h>
	#include <errno.h>
#include "transact.h"	#include "transact.h"
#include "locktab.h"	#include "locktab.h"
#include <errno.h>	#include "log.h"

#ifdef LIBFREEM	#ifdef LIBFREEM
# include "errmsg.h"	# include "errmsg.h"
Line 652 short ipc_pending = 0; /* 1 if an inco	Line 662 short ipc_pending = 0; /* 1 if an inco

int strict_mode = 0;	int strict_mode = 0;

	int trace_mode = 0;

short first_process = FALSE;	short first_process = FALSE;
#if defined(__FreeBSD__)	#if defined(__FreeBSD__)
size_t shm_init_size = 4194304;	size_t shm_init_size = 4194304;
Line 666 void unnew (void)	Line 678 void unnew (void)
int i;	int i;
long j;	long j;
char tmp[256];	char tmp[256];

	printf ("unnew\r\n");

#ifdef DEBUG_NEWPTR	#ifdef DEBUG_NEWPTR
int loop;	int loop;
Line 740 void m_fatal(char *s)	Line 754 void m_fatal(char *s)


if (tp_level) {	if (tp_level) {
fprintf (stderr, "freem [FATAL]: memory allocation failure in %s; rolling back %d transactions [errno %d %s]\n", s, tp_level, errno_sav, strerror (errno_sav));	/* TODO: make this FM_LOG_FATAL (logger will need to do a tp_trollback) */
	logprintf (FM_LOG_ERROR, "freem: memory allocation failure in %s; rolling back %d transactions (error code %d [%s])", s, tp_level, errno_sav, strerror (errno_sav));
tp_trollback (tp_level);	tp_trollback (tp_level);
}	}
else {	else {
fprintf (stderr, "freem [FATAL]: memory allocation failure in %s [errno %d %s]\n", s, errno_sav, strerror (errno_sav));	logprintf (FM_LOG_FATAL, "freem: memory allocation failure in %s (error code %d [%s])", s, errno_sav, strerror (errno_sav));
}	}

exit (3);	exit (3);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.12
changed lines
	Added in v.1.15