2001-08-21 17:19:19 +02:00
|
|
|
|
/* A Fibonacci heap datatype.
|
Update libiberty sources with changes in the gcc mainline.
+2020-01-01 Jakub Jelinek <jakub@redhat.com>
+
+ Update copyright years.
+
+2019-12-06 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * make-relative-prefix.c (split_directories):
+ Return early on empty 'name'
+
+2019-11-16 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * cp-demangle.c (d_print_init): Remove const from 4th param.
+ (cplus_demangle_fill_name): Initialize d->d_counting.
+ (cplus_demangle_fill_extended_operator): Likewise.
+ (cplus_demangle_fill_ctor): Likewise.
+ (cplus_demangle_fill_dtor): Likewise.
+ (d_make_empty): Likewise.
+ (d_count_templates_scopes): Remobe const from 3rd param,
+ Return on dc->d_counting > 1,
+ Increment dc->d_counting.
+ * cp-demint.c (cplus_demangle_fill_component): Initialize d->d_counting.
+ (cplus_demangle_fill_builtin_type): Likewise.
+ (cplus_demangle_fill_operator): Likewise.
+
+2019-11-16 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * cplus-dem.c (cplus_demangle): Use rust_demangle directly.
+ (rust_demangle): Remove.
+ * rust-demangle.c (is_prefixed_hash): Rename to is_legacy_prefixed_hash.
+ (parse_lower_hex_nibble): Rename to decode_lower_hex_nibble.
+ (parse_legacy_escape): Rename to decode_legacy_escape.
+ (rust_is_mangled): Remove.
+ (struct rust_demangler): Add.
+ (peek): Add.
+ (next): Add.
+ (struct rust_mangled_ident): Add.
+ (parse_ident): Add.
+ (rust_demangle_sym): Remove.
+ (print_str): Add.
+ (PRINT): Add.
+ (print_ident): Add.
+ (rust_demangle_callback): Add.
+ (struct str_buf): Add.
+ (str_buf_reserve): Add.
+ (str_buf_append): Add.
+ (str_buf_demangle_callback): Add.
+ (rust_demangle): Add.
+ * rust-demangle.h: Remove.
+
+2019-11-15 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * testsuite/demangle-expected: Fix test.
+
+2019-11-04 Kamlesh Kumar <kamleshbhalui@gmail.com>
+
+ * cp-demangle.c (d_expr_primary): Handle
+ nullptr demangling.
+ * testsuite/demangle-expected: Added test.
+
+2019-10-29 Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ * cp-demangle.c (d_number): Avoid signed int overflow.
+
+2019-10-28 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * cp-demangle.c (d_print_mod): Add a space before printing `complex`
+ and `imaginary`, as opposed to after.
+ * testsuite/demangle-expected: Adjust test.
+
+2019-10-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (looks_like_rust): Remove.
+ (rust_is_mangled): Don't check escapes.
+ (is_prefixed_hash): Allow 0-9a-f permutations.
+ (rust_demangle_sym): Don't bail on unknown escapes.
+ * testsuite/rust-demangle-expected: Update 'main::$99$' test.
+
+2019-09-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (unescape): Remove.
+ (parse_lower_hex_nibble): New function.
+ (parse_legacy_escape): New function.
+ (is_prefixed_hash): Use parse_lower_hex_nibble.
+ (looks_like_rust): Use parse_legacy_escape.
+ (rust_demangle_sym): Use parse_legacy_escape.
+ * testsuite/rust-demangle-expected: Add 'llv$u6d$' test.
+
+2019-08-27 Martin Liska <mliska@suse.cz>
+
+ PR lto/91478
+ * simple-object-elf.c (simple_object_elf_copy_lto_debug_sections):
+ First find a WEAK HIDDEN symbol in symbol table that will be
+ preserved. Later, use the symbol name for all removed symbols.
+
+2019-08-12 Martin Liska <mliska@suse.cz>
+
+ * Makefile.in: Add filedescriptor.c.
+ * filedescriptor.c: New file.
+ * lrealpath.c (is_valid_fd): Remove.
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 0be45b4ae8..fe738d0db4 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -1,7 +1,7 @@
# Makefile for the libiberty library.
# Originally written by K. Richard Pixley <rich@cygnus.com>.
#
-# Copyright (C) 1990-2019 Free Software Foundation, Inc.
+# Copyright (C) 1990-2020 Free Software Foundation, Inc.
#
# This file is part of the libiberty library.
# Libiberty is free software; you can redistribute it and/or
@@ -127,7 +127,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \
calloc.c choose-temp.c clock.c concat.c cp-demangle.c \
cp-demint.c cplus-dem.c crc32.c \
d-demangle.c dwarfnames.c dyn-string.c \
- fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c \
+ fdmatch.c ffs.c fibheap.c filedescriptor.c filename_cmp.c floatformat.c \
fnmatch.c fopen_unlocked.c \
getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c \
gettimeofday.c \
@@ -171,6 +171,7 @@ REQUIRED_OFILES = \
./cp-demint.$(objext) ./crc32.$(objext) ./d-demangle.$(objext) \
./dwarfnames.$(objext) ./dyn-string.$(objext) \
./fdmatch.$(objext) ./fibheap.$(objext) \
+ ./filedescriptor.$(objext) \
./filename_cmp.$(objext) ./floatformat.$(objext) \
./fnmatch.$(objext) ./fopen_unlocked.$(objext) \
./getopt.$(objext) ./getopt1.$(objext) ./getpwd.$(objext) \
@@ -756,6 +757,17 @@ $(CONFIGURED_OFILES): stamp-picdir stamp-noasandir
else true; fi
$(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION)
+./filedescriptor.$(objext): $(srcdir)/filedescriptor.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/filedescriptor.c -o pic/$@; \
+ else true; fi
+ if [ x"$(NOASANFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(NOASANFLAG) $(srcdir)/filedescriptor.c -o noasan/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/filedescriptor.c $(OUTPUT_OPTION)
+
+
./filename_cmp.$(objext): $(srcdir)/filename_cmp.c config.h $(INCDIR)/ansidecl.h \
$(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
$(INCDIR)/safe-ctype.h
diff --git a/libiberty/_doprnt.c b/libiberty/_doprnt.c
index d44dc415ed..a739f4304f 100644
--- a/libiberty/_doprnt.c
+++ b/libiberty/_doprnt.c
@@ -1,5 +1,5 @@
/* Provide a version of _doprnt in terms of fprintf.
- Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ Copyright (C) 1998-2020 Free Software Foundation, Inc.
Contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 3/29/98
This program is free software; you can redistribute it and/or modify it
diff --git a/libiberty/argv.c b/libiberty/argv.c
index 6444896f99..8c9794db6a 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -1,5 +1,5 @@
/* Create and destroy argument vectors (argv's)
- Copyright (C) 1992-2019 Free Software Foundation, Inc.
+ Copyright (C) 1992-2020 Free Software Foundation, Inc.
Written by Fred Fish @ Cygnus Support
This file is part of the libiberty library.
diff --git a/libiberty/asprintf.c b/libiberty/asprintf.c
index 5718682f69..6e38e2234d 100644
--- a/libiberty/asprintf.c
+++ b/libiberty/asprintf.c
@@ -1,6 +1,6 @@
/* Like sprintf but provides a pointer to malloc'd storage, which must
be freed by the caller.
- Copyright (C) 1997-2019 Free Software Foundation, Inc.
+ Copyright (C) 1997-2020 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
This file is part of the libiberty library.
diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c
index 72c1b710bd..49a2faaa51 100644
--- a/libiberty/choose-temp.c
+++ b/libiberty/choose-temp.c
@@ -1,5 +1,5 @@
/* Utility to pick a temporary filename prefix.
- Copyright (C) 1996-2019 Free Software Foundation, Inc.
+ Copyright (C) 1996-2020 Free Software Foundation, Inc.
This file is part of the libiberty library.
Libiberty is free software; you can redistribute it and/or
diff --git a/libiberty/clock.c b/libiberty/clock.c
index a3730714bd..0de74657d0 100644
--- a/libiberty/clock.c
+++ b/libiberty/clock.c
@@ -1,5 +1,5 @@
/* ANSI-compatible clock function.
- Copyright (C) 1994-2019 Free Software Foundation, Inc.
+ Copyright (C) 1994-2020 Free Software Foundation, Inc.
This file is part of the libiberty library. This library is free
software; you can redistribute it and/or modify it under the
diff --git
2020-01-17 15:13:22 +01:00
|
|
|
|
Copyright (C) 1998-2020 Free Software Foundation, Inc.
|
2001-08-21 17:19:19 +02:00
|
|
|
|
Contributed by Daniel Berlin (dan@cgsoftware.com).
|
|
|
|
|
|
|
|
|
|
This file is part of GNU CC.
|
|
|
|
|
|
|
|
|
|
GNU CC is free software; you can redistribute it and/or modify it
|
|
|
|
|
under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
|
|
GNU CC is distributed in the hope that it will be useful, but
|
|
|
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with GNU CC; see the file COPYING. If not, write to
|
2005-05-10 17:33:34 +02:00
|
|
|
|
the Free Software Foundation, 51 Franklin Street - Fifth Floor,
|
|
|
|
|
Boston, MA 02110-1301, USA. */
|
2001-08-21 17:19:19 +02:00
|
|
|
|
|
2001-08-22 04:12:15 +02:00
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
|
#include "config.h"
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef HAVE_LIMITS_H
|
2001-08-21 17:19:19 +02:00
|
|
|
|
#include <limits.h>
|
2001-08-22 04:12:15 +02:00
|
|
|
|
#endif
|
|
|
|
|
#ifdef HAVE_STDLIB_H
|
2001-08-21 17:19:19 +02:00
|
|
|
|
#include <stdlib.h>
|
2001-08-22 04:12:15 +02:00
|
|
|
|
#endif
|
|
|
|
|
#ifdef HAVE_STRING_H
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#endif
|
2001-08-21 17:19:19 +02:00
|
|
|
|
#include "libiberty.h"
|
|
|
|
|
#include "fibheap.h"
|
|
|
|
|
|
|
|
|
|
|
2001-08-22 04:12:15 +02:00
|
|
|
|
#define FIBHEAPKEY_MIN LONG_MIN
|
|
|
|
|
|
2005-03-28 04:09:01 +02:00
|
|
|
|
static void fibheap_ins_root (fibheap_t, fibnode_t);
|
|
|
|
|
static void fibheap_rem_root (fibheap_t, fibnode_t);
|
|
|
|
|
static void fibheap_consolidate (fibheap_t);
|
|
|
|
|
static void fibheap_link (fibheap_t, fibnode_t, fibnode_t);
|
|
|
|
|
static void fibheap_cut (fibheap_t, fibnode_t, fibnode_t);
|
|
|
|
|
static void fibheap_cascading_cut (fibheap_t, fibnode_t);
|
|
|
|
|
static fibnode_t fibheap_extr_min_node (fibheap_t);
|
|
|
|
|
static int fibheap_compare (fibheap_t, fibnode_t, fibnode_t);
|
|
|
|
|
static int fibheap_comp_data (fibheap_t, fibheapkey_t, void *, fibnode_t);
|
|
|
|
|
static fibnode_t fibnode_new (void);
|
|
|
|
|
static void fibnode_insert_after (fibnode_t, fibnode_t);
|
2001-08-21 17:19:19 +02:00
|
|
|
|
#define fibnode_insert_before(a, b) fibnode_insert_after (a->left, b)
|
2005-03-28 04:09:01 +02:00
|
|
|
|
static fibnode_t fibnode_remove (fibnode_t);
|
2001-08-21 17:19:19 +02:00
|
|
|
|
|
2001-08-22 04:12:15 +02:00
|
|
|
|
|
2001-08-21 17:19:19 +02:00
|
|
|
|
/* Create a new fibonacci heap. */
|
|
|
|
|
fibheap_t
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_new (void)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
2001-08-23 00:55:38 +02:00
|
|
|
|
return (fibheap_t) xcalloc (1, sizeof (struct fibheap));
|
2001-08-22 04:12:15 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create a new fibonacci heap node. */
|
2001-08-23 00:55:38 +02:00
|
|
|
|
static fibnode_t
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibnode_new (void)
|
2001-08-22 04:12:15 +02:00
|
|
|
|
{
|
2001-08-23 00:55:38 +02:00
|
|
|
|
fibnode_t node;
|
2001-08-22 04:12:15 +02:00
|
|
|
|
|
2002-09-20 15:45:20 +02:00
|
|
|
|
node = (fibnode_t) xcalloc (1, sizeof *node);
|
2001-08-23 00:55:38 +02:00
|
|
|
|
node->left = node;
|
|
|
|
|
node->right = node;
|
2001-08-22 04:12:15 +02:00
|
|
|
|
|
2001-08-23 00:55:38 +02:00
|
|
|
|
return node;
|
2001-08-22 04:12:15 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline int
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_compare (fibheap_t heap ATTRIBUTE_UNUSED, fibnode_t a, fibnode_t b)
|
2001-08-22 04:12:15 +02:00
|
|
|
|
{
|
|
|
|
|
if (a->key < b->key)
|
|
|
|
|
return -1;
|
|
|
|
|
if (a->key > b->key)
|
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline int
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_comp_data (fibheap_t heap, fibheapkey_t key, void *data, fibnode_t b)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
2001-08-22 04:12:15 +02:00
|
|
|
|
struct fibnode a;
|
|
|
|
|
|
|
|
|
|
a.key = key;
|
|
|
|
|
a.data = data;
|
|
|
|
|
|
|
|
|
|
return fibheap_compare (heap, &a, b);
|
2001-08-21 17:19:19 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Insert DATA, with priority KEY, into HEAP. */
|
|
|
|
|
fibnode_t
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_insert (fibheap_t heap, fibheapkey_t key, void *data)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
fibnode_t node;
|
2001-08-22 04:12:15 +02:00
|
|
|
|
|
2001-08-23 00:55:38 +02:00
|
|
|
|
/* Create the new node. */
|
|
|
|
|
node = fibnode_new ();
|
2001-08-22 04:12:15 +02:00
|
|
|
|
|
2001-08-21 17:19:19 +02:00
|
|
|
|
/* Set the node's data. */
|
|
|
|
|
node->data = data;
|
|
|
|
|
node->key = key;
|
|
|
|
|
|
|
|
|
|
/* Insert it into the root list. */
|
|
|
|
|
fibheap_ins_root (heap, node);
|
|
|
|
|
|
2001-08-22 04:12:15 +02:00
|
|
|
|
/* If their was no minimum, or this key is less than the min,
|
|
|
|
|
it's the new min. */
|
2001-08-21 17:19:19 +02:00
|
|
|
|
if (heap->min == NULL || node->key < heap->min->key)
|
|
|
|
|
heap->min = node;
|
|
|
|
|
|
|
|
|
|
heap->nodes++;
|
|
|
|
|
|
|
|
|
|
return node;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the data of the minimum node (if we know it). */
|
|
|
|
|
void *
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_min (fibheap_t heap)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
/* If there is no min, we can't easily return it. */
|
|
|
|
|
if (heap->min == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
return heap->min->data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the key of the minimum node (if we know it). */
|
|
|
|
|
fibheapkey_t
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_min_key (fibheap_t heap)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
/* If there is no min, we can't easily return it. */
|
|
|
|
|
if (heap->min == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
return heap->min->key;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Union HEAPA and HEAPB into a new heap. */
|
|
|
|
|
fibheap_t
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_union (fibheap_t heapa, fibheap_t heapb)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
2001-08-22 04:12:15 +02:00
|
|
|
|
fibnode_t a_root, b_root, temp;
|
2001-08-21 17:19:19 +02:00
|
|
|
|
|
|
|
|
|
/* If one of the heaps is empty, the union is just the other heap. */
|
2001-08-22 04:12:15 +02:00
|
|
|
|
if ((a_root = heapa->root) == NULL)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
2001-08-22 04:12:15 +02:00
|
|
|
|
free (heapa);
|
|
|
|
|
return heapb;
|
|
|
|
|
}
|
|
|
|
|
if ((b_root = heapb->root) == NULL)
|
|
|
|
|
{
|
|
|
|
|
free (heapb);
|
|
|
|
|
return heapa;
|
2001-08-21 17:19:19 +02:00
|
|
|
|
}
|
2001-08-22 04:12:15 +02:00
|
|
|
|
|
2001-08-21 17:19:19 +02:00
|
|
|
|
/* Merge them to the next nodes on the opposite chain. */
|
2001-08-22 04:12:15 +02:00
|
|
|
|
a_root->left->right = b_root;
|
|
|
|
|
b_root->left->right = a_root;
|
|
|
|
|
temp = a_root->left;
|
|
|
|
|
a_root->left = b_root->left;
|
|
|
|
|
b_root->left = temp;
|
2001-08-21 17:19:19 +02:00
|
|
|
|
heapa->nodes += heapb->nodes;
|
|
|
|
|
|
|
|
|
|
/* And set the new minimum, if it's changed. */
|
|
|
|
|
if (fibheap_compare (heapa, heapb->min, heapa->min) < 0)
|
|
|
|
|
heapa->min = heapb->min;
|
|
|
|
|
|
|
|
|
|
free (heapb);
|
|
|
|
|
return heapa;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Extract the data of the minimum node from HEAP. */
|
|
|
|
|
void *
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_extract_min (fibheap_t heap)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
fibnode_t z;
|
2001-08-22 04:12:15 +02:00
|
|
|
|
void *ret = NULL;
|
2001-08-21 17:19:19 +02:00
|
|
|
|
|
|
|
|
|
/* If we don't have a min set, it means we have no nodes. */
|
|
|
|
|
if (heap->min != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Otherwise, extract the min node, free the node, and return the
|
|
|
|
|
node's data. */
|
|
|
|
|
z = fibheap_extr_min_node (heap);
|
|
|
|
|
ret = z->data;
|
|
|
|
|
free (z);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Replace both the KEY and the DATA associated with NODE. */
|
|
|
|
|
void *
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_replace_key_data (fibheap_t heap, fibnode_t node,
|
|
|
|
|
fibheapkey_t key, void *data)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
void *odata;
|
2003-09-07 01:51:12 +02:00
|
|
|
|
fibheapkey_t okey;
|
2001-08-21 17:19:19 +02:00
|
|
|
|
fibnode_t y;
|
|
|
|
|
|
|
|
|
|
/* If we wanted to, we could actually do a real increase by redeleting and
|
|
|
|
|
inserting. However, this would require O (log n) time. So just bail out
|
|
|
|
|
for now. */
|
|
|
|
|
if (fibheap_comp_data (heap, key, data, node) > 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
odata = node->data;
|
|
|
|
|
okey = node->key;
|
|
|
|
|
node->data = data;
|
|
|
|
|
node->key = key;
|
|
|
|
|
y = node->parent;
|
|
|
|
|
|
2009-05-29 05:01:15 +02:00
|
|
|
|
/* Short-circuit if the key is the same, as we then don't have to
|
|
|
|
|
do anything. Except if we're trying to force the new node to
|
|
|
|
|
be the new minimum for delete. */
|
|
|
|
|
if (okey == key && okey != FIBHEAPKEY_MIN)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
return odata;
|
|
|
|
|
|
|
|
|
|
/* These two compares are specifically <= 0 to make sure that in the case
|
|
|
|
|
of equality, a node we replaced the data on, becomes the new min. This
|
|
|
|
|
is needed so that delete's call to extractmin gets the right node. */
|
|
|
|
|
if (y != NULL && fibheap_compare (heap, node, y) <= 0)
|
|
|
|
|
{
|
|
|
|
|
fibheap_cut (heap, node, y);
|
|
|
|
|
fibheap_cascading_cut (heap, y);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (fibheap_compare (heap, node, heap->min) <= 0)
|
|
|
|
|
heap->min = node;
|
|
|
|
|
|
|
|
|
|
return odata;
|
|
|
|
|
}
|
|
|
|
|
|
2001-08-22 04:12:15 +02:00
|
|
|
|
/* Replace the DATA associated with NODE. */
|
|
|
|
|
void *
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_replace_data (fibheap_t heap, fibnode_t node, void *data)
|
2001-08-22 04:12:15 +02:00
|
|
|
|
{
|
|
|
|
|
return fibheap_replace_key_data (heap, node, node->key, data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Replace the KEY associated with NODE. */
|
|
|
|
|
fibheapkey_t
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_replace_key (fibheap_t heap, fibnode_t node, fibheapkey_t key)
|
2001-08-22 04:12:15 +02:00
|
|
|
|
{
|
|
|
|
|
int okey = node->key;
|
|
|
|
|
fibheap_replace_key_data (heap, node, key, node->data);
|
|
|
|
|
return okey;
|
|
|
|
|
}
|
|
|
|
|
|
2001-08-21 17:19:19 +02:00
|
|
|
|
/* Delete NODE from HEAP. */
|
|
|
|
|
void *
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_delete_node (fibheap_t heap, fibnode_t node)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
2001-08-22 04:12:15 +02:00
|
|
|
|
void *ret = node->data;
|
|
|
|
|
|
2001-08-21 17:19:19 +02:00
|
|
|
|
/* To perform delete, we just make it the min key, and extract. */
|
2001-08-22 04:12:15 +02:00
|
|
|
|
fibheap_replace_key (heap, node, FIBHEAPKEY_MIN);
|
2009-05-29 05:01:15 +02:00
|
|
|
|
if (node != heap->min)
|
|
|
|
|
{
|
|
|
|
|
fprintf (stderr, "Can't force minimum on fibheap.\n");
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
2001-08-21 17:19:19 +02:00
|
|
|
|
fibheap_extract_min (heap);
|
|
|
|
|
|
2001-08-22 04:12:15 +02:00
|
|
|
|
return ret;
|
2001-08-21 17:19:19 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Delete HEAP. */
|
|
|
|
|
void
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_delete (fibheap_t heap)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
while (heap->min != NULL)
|
|
|
|
|
free (fibheap_extr_min_node (heap));
|
|
|
|
|
|
|
|
|
|
free (heap);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Determine if HEAP is empty. */
|
|
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_empty (fibheap_t heap)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
return heap->nodes == 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Extract the minimum node of the heap. */
|
|
|
|
|
static fibnode_t
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_extr_min_node (fibheap_t heap)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
2001-08-22 04:12:15 +02:00
|
|
|
|
fibnode_t ret = heap->min;
|
2001-08-21 17:19:19 +02:00
|
|
|
|
fibnode_t x, y, orig;
|
|
|
|
|
|
|
|
|
|
/* Attach the child list of the minimum node to the root list of the heap.
|
|
|
|
|
If there is no child list, we don't do squat. */
|
2001-08-22 04:12:15 +02:00
|
|
|
|
for (x = ret->child, orig = NULL; x != orig && x != NULL; x = y)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
if (orig == NULL)
|
|
|
|
|
orig = x;
|
|
|
|
|
y = x->right;
|
|
|
|
|
x->parent = NULL;
|
|
|
|
|
fibheap_ins_root (heap, x);
|
|
|
|
|
}
|
2001-08-22 04:12:15 +02:00
|
|
|
|
|
2001-08-21 17:19:19 +02:00
|
|
|
|
/* Remove the old root. */
|
|
|
|
|
fibheap_rem_root (heap, ret);
|
|
|
|
|
heap->nodes--;
|
2001-08-22 04:12:15 +02:00
|
|
|
|
|
2001-08-21 17:19:19 +02:00
|
|
|
|
/* If we are left with no nodes, then the min is NULL. */
|
|
|
|
|
if (heap->nodes == 0)
|
|
|
|
|
heap->min = NULL;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Otherwise, consolidate to find new minimum, as well as do the reorg
|
|
|
|
|
work that needs to be done. */
|
|
|
|
|
heap->min = ret->right;
|
|
|
|
|
fibheap_consolidate (heap);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Insert NODE into the root list of HEAP. */
|
|
|
|
|
static void
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_ins_root (fibheap_t heap, fibnode_t node)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
/* If the heap is currently empty, the new node becomes the singleton
|
|
|
|
|
circular root list. */
|
|
|
|
|
if (heap->root == NULL)
|
|
|
|
|
{
|
|
|
|
|
heap->root = node;
|
|
|
|
|
node->left = node;
|
|
|
|
|
node->right = node;
|
|
|
|
|
return;
|
|
|
|
|
}
|
2001-08-22 04:12:15 +02:00
|
|
|
|
|
|
|
|
|
/* Otherwise, insert it in the circular root list between the root
|
|
|
|
|
and it's right node. */
|
2001-08-21 17:19:19 +02:00
|
|
|
|
fibnode_insert_after (heap->root, node);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Remove NODE from the rootlist of HEAP. */
|
|
|
|
|
static void
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_rem_root (fibheap_t heap, fibnode_t node)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
if (node->left == node)
|
|
|
|
|
heap->root = NULL;
|
|
|
|
|
else
|
|
|
|
|
heap->root = fibnode_remove (node);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Consolidate the heap. */
|
|
|
|
|
static void
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_consolidate (fibheap_t heap)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
fibnode_t a[1 + 8 * sizeof (long)];
|
|
|
|
|
fibnode_t w;
|
|
|
|
|
fibnode_t y;
|
|
|
|
|
fibnode_t x;
|
|
|
|
|
int i;
|
|
|
|
|
int d;
|
|
|
|
|
int D;
|
|
|
|
|
|
|
|
|
|
D = 1 + 8 * sizeof (long);
|
|
|
|
|
|
|
|
|
|
memset (a, 0, sizeof (fibnode_t) * D);
|
|
|
|
|
|
|
|
|
|
while ((w = heap->root) != NULL)
|
|
|
|
|
{
|
|
|
|
|
x = w;
|
|
|
|
|
fibheap_rem_root (heap, w);
|
|
|
|
|
d = x->degree;
|
|
|
|
|
while (a[d] != NULL)
|
|
|
|
|
{
|
|
|
|
|
y = a[d];
|
|
|
|
|
if (fibheap_compare (heap, x, y) > 0)
|
|
|
|
|
{
|
|
|
|
|
fibnode_t temp;
|
|
|
|
|
temp = x;
|
|
|
|
|
x = y;
|
|
|
|
|
y = temp;
|
|
|
|
|
}
|
|
|
|
|
fibheap_link (heap, y, x);
|
|
|
|
|
a[d] = NULL;
|
|
|
|
|
d++;
|
|
|
|
|
}
|
|
|
|
|
a[d] = x;
|
|
|
|
|
}
|
|
|
|
|
heap->min = NULL;
|
|
|
|
|
for (i = 0; i < D; i++)
|
|
|
|
|
if (a[i] != NULL)
|
|
|
|
|
{
|
|
|
|
|
fibheap_ins_root (heap, a[i]);
|
|
|
|
|
if (heap->min == NULL || fibheap_compare (heap, a[i], heap->min) < 0)
|
|
|
|
|
heap->min = a[i];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Make NODE a child of PARENT. */
|
|
|
|
|
static void
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_link (fibheap_t heap ATTRIBUTE_UNUSED,
|
|
|
|
|
fibnode_t node, fibnode_t parent)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
if (parent->child == NULL)
|
|
|
|
|
parent->child = node;
|
|
|
|
|
else
|
|
|
|
|
fibnode_insert_before (parent->child, node);
|
|
|
|
|
node->parent = parent;
|
|
|
|
|
parent->degree++;
|
|
|
|
|
node->mark = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Remove NODE from PARENT's child list. */
|
|
|
|
|
static void
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_cut (fibheap_t heap, fibnode_t node, fibnode_t parent)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
fibnode_remove (node);
|
|
|
|
|
parent->degree--;
|
|
|
|
|
fibheap_ins_root (heap, node);
|
|
|
|
|
node->parent = NULL;
|
|
|
|
|
node->mark = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibheap_cascading_cut (fibheap_t heap, fibnode_t y)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
fibnode_t z;
|
|
|
|
|
|
|
|
|
|
while ((z = y->parent) != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (y->mark == 0)
|
|
|
|
|
{
|
|
|
|
|
y->mark = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
fibheap_cut (heap, y, z);
|
|
|
|
|
y = z;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibnode_insert_after (fibnode_t a, fibnode_t b)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
if (a == a->right)
|
|
|
|
|
{
|
|
|
|
|
a->right = b;
|
|
|
|
|
a->left = b;
|
|
|
|
|
b->right = a;
|
|
|
|
|
b->left = a;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
b->right = a->right;
|
|
|
|
|
a->right->left = b;
|
|
|
|
|
a->right = b;
|
|
|
|
|
b->left = a;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static fibnode_t
|
2005-03-28 04:09:01 +02:00
|
|
|
|
fibnode_remove (fibnode_t node)
|
2001-08-21 17:19:19 +02:00
|
|
|
|
{
|
|
|
|
|
fibnode_t ret;
|
|
|
|
|
|
|
|
|
|
if (node == node->left)
|
|
|
|
|
ret = NULL;
|
|
|
|
|
else
|
|
|
|
|
ret = node->left;
|
|
|
|
|
|
|
|
|
|
if (node->parent != NULL && node->parent->child == node)
|
|
|
|
|
node->parent->child = ret;
|
|
|
|
|
|
|
|
|
|
node->right->left = node->left;
|
|
|
|
|
node->left->right = node->right;
|
|
|
|
|
|
|
|
|
|
node->parent = NULL;
|
|
|
|
|
node->left = node;
|
|
|
|
|
node->right = node;
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|