Skip to content

Commit

Permalink
[#193] Fix various GTM-F- occurrences to be YDB-F- since ydb_msgprefi…
Browse files Browse the repository at this point in the history
…x default is YDB in r1.20
  • Loading branch information
nars1 committed Apr 6, 2018
1 parent 7b11dba commit 7459132
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
4 changes: 2 additions & 2 deletions sr_port/gtm_threadgbl_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,13 @@ void gtm_threadgbl_init(void)
{ /* Size mismatch with gtm_threadgbl_deftypes.h - no error handling yet available so do
* the best we can.
*/
FPRINTF(stderr, "GTM-F-GTMASSERT gtm_threadgbl_true_t and gtm_threadgbl_t are different sizes\n");
FPRINTF(stderr, "YDB-F-GTMASSERT gtm_threadgbl_true_t and gtm_threadgbl_t are different sizes\n");
EXIT(ERR_GTMASSERT);
}
gtm_threadgbl = lcl_gtm_threadgbl = malloc(size_gtm_threadgbl_struct);
if (NULL == gtm_threadgbl)
{ /* Storage was not allocated for some reason - no error handling yet still */
perror("GTM-F-MEMORY Unable to allocate startup thread structure");
perror("YDB-F-MEMORY Unable to allocate startup thread structure");
EXIT(ERR_MEMORY);
}
memset(gtm_threadgbl, 0, size_gtm_threadgbl_struct);
Expand Down
6 changes: 3 additions & 3 deletions sr_port/op_svget.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyright (c) 2001-2017 Fidelity National Information *
* Services, Inc. and/or its subsidiaries. All rights reserved. *
* *
* Copyright (c) 2017 YottaDB LLC. and/or its subsidiaries. *
* Copyright (c) 2017-2018 YottaDB LLC. and/or its subsidiaries.*
* All rights reserved. *
* *
* This source code contains the intellectual property *
Expand Down Expand Up @@ -369,9 +369,9 @@ void op_svget(int varnum, mval *v)
break;
case SV_ZROUTINES:
/* If we are in the process of exiting and come here (e.g. to do ZSHOW dump as part of creating
* the fatal zshow dump file due to a fatal GTM-F-MEMORY error), do not invoke zro_init() as that
* the fatal zshow dump file due to a fatal YDB-F-MEMORY error), do not invoke zro_init() as that
* might in turn require more memory (e.g. attach to relinkctl shared memory etc.) and we dont
* want to get a nested GTM-F-MEMORY error.
* want to get a nested YDB-F-MEMORY error.
*/
if (!TREF(zro_root) && !process_exiting)
zro_init();
Expand Down
5 changes: 4 additions & 1 deletion sr_unix/mur_cre_file_extfmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
* Copyright (c) 2003-2017 Fidelity National Information *
* Services, Inc. and/or its subsidiaries. All rights reserved. *
* *
* Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. *
* All rights reserved. *
* *
* This source code contains the intellectual property *
* of its copyright holder(s), and is made available *
* under a license. If you do not know the terms of *
Expand Down Expand Up @@ -256,7 +259,7 @@ int4 mur_cre_file_extfmt(jnl_ctl_list *jctl, int recstat)
if (key_reset)
multi_proc_key = NULL; /* reset key until it can be set to rctl's region-name again */
/* Record the fact that this child process created an extract file in shared memory
* so parent can clean it up later in case the child process dies abruptly (e.g. GTM-F-MEMORY)
* so parent can clean it up later in case the child process dies abruptly (e.g. YDB-F-MEMORY)
* before it does the full copy of needed information at the end of "mur_forward_multi_proc".
*/
rctl_index = rctl - &mur_ctl[0];
Expand Down
5 changes: 4 additions & 1 deletion sr_unix/remove_rms.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
* Copyright (c) 2001-2017 Fidelity National Information *
* Services, Inc. and/or its subsidiaries. All rights reserved. *
* *
* Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. *
* All rights reserved. *
* *
* This source code contains the intellectual property *
* of its copyright holder(s), and is made available *
* under a license. If you do not know the terms of *
Expand Down Expand Up @@ -87,7 +90,7 @@ void remove_rms (io_desc *ciod)
continue;
}
iod = lp->iod;
/* Handle case where iod can be NULL (e.g. if GTM-F-MEMORY occurred during device setup & we are creating
/* Handle case where iod can be NULL (e.g. if YDB-F-MEMORY occurred during device setup & we are creating
* zshow dump file).
*/
assert((NULL != iod) || (process_exiting && TREF(jobexam_counter)));
Expand Down
5 changes: 4 additions & 1 deletion sr_unix/zshow_devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
* Copyright (c) 2001-2017 Fidelity National Information *
* Services, Inc. and/or its subsidiaries. All rights reserved. *
* *
* Copyright (c) 2018 YottaDB LLC. and/or its subsidiaries. *
* All rights reserved. *
* *
* This source code contains the intellectual property *
* of its copyright holder(s), and is made available *
* under a license. If you do not know the terms of *
Expand Down Expand Up @@ -165,7 +168,7 @@ void zshow_devices(zshow_out *output)
}
if (NULL == l->iod)
{
assert(process_exiting); /* GTM-F-MEMORY occurred during device setup & we are creating zshow dump file */
assert(process_exiting); /* YDB-F-MEMORY occurred during device setup & we are creating zshow dump file */
assert(TREF(jobexam_counter));
continue;
}
Expand Down

0 comments on commit 7459132

Please sign in to comment.