New upstream version 1.11.0+dfsgupstream/1.11.0+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 264 deletions

diff --git a/src/registry_person.c b/src/registry_person.c
deleted file mode 100644
index d8b6cd98a..000000000
--- a/src/registry_person.c
+++ /dev/null
@@ -1,264 +0,0 @@
-#include "registry_internals.h"
-
-// ----------------------------------------------------------------------------
-// PERSON_URL INDEX
-
-int person_url_compare(void *a, void *b) {
-    register uint32_t hash1 = ((REGISTRY_PERSON_URL *)a)->url->hash;
-    register uint32_t hash2 = ((REGISTRY_PERSON_URL *)b)->url->hash;
-
-    if(hash1 < hash2) return -1;
-    else if(hash1 > hash2) return 1;
-    else return strcmp(((REGISTRY_PERSON_URL *)a)->url->url, ((REGISTRY_PERSON_URL *)b)->url->url);
-}
-
-inline REGISTRY_PERSON_URL *registry_person_url_index_find(REGISTRY_PERSON *p, const char *url) {
-    debug(D_REGISTRY, "Registry: registry_person_url_index_find('%s', '%s')", p->guid, url);
-
-    char buf[sizeof(REGISTRY_URL) + strlen(url)];
-
-    REGISTRY_URL *u = (REGISTRY_URL *)&buf;
-    strcpy(u->url, url);
-    u->hash = simple_hash(u->url);
-
-    REGISTRY_PERSON_URL tpu = { .url = u };
-
-    REGISTRY_PERSON_URL *pu = (REGISTRY_PERSON_URL *)avl_search(&p->person_urls, (void *)&tpu);
-    return pu;
-}
-
-inline REGISTRY_PERSON_URL *registry_person_url_index_add(REGISTRY_PERSON *p, REGISTRY_PERSON_URL *pu) {
-    debug(D_REGISTRY, "Registry: registry_person_url_index_add('%s', '%s')", p->guid, pu->url->url);
-    REGISTRY_PERSON_URL *tpu = (REGISTRY_PERSON_URL *)avl_insert(&(p->person_urls), (avl *)(pu));
-    if(tpu != pu)
-        error("Registry: registry_person_url_index_add('%s', '%s') already exists as '%s'", p->guid, pu->url->url, tpu->url->url);
-
-    return tpu;
-}
-
-inline REGISTRY_PERSON_URL *registry_person_url_index_del(REGISTRY_PERSON *p, REGISTRY_PERSON_URL *pu) {
-    debug(D_REGISTRY, "Registry: registry_person_url_index_del('%s', '%s')", p->guid, pu->url->url);
-    REGISTRY_PERSON_URL *tpu = (REGISTRY_PERSON_URL *)avl_remove(&(p->person_urls), (avl *)(pu));
-    if(!tpu)
-        error("Registry: registry_person_url_index_del('%s', '%s') deleted nothing", p->guid, pu->url->url);
-    else if(tpu != pu)
-        error("Registry: registry_person_url_index_del('%s', '%s') deleted wrong URL '%s'", p->guid, pu->url->url, tpu->url->url);
-
-    return tpu;
-}
-
-// ----------------------------------------------------------------------------
-// PERSON_URL
-
-REGISTRY_PERSON_URL *registry_person_url_allocate(REGISTRY_PERSON *p, REGISTRY_MACHINE *m, REGISTRY_URL *u, char *name, size_t namelen, time_t when) {
-    debug(D_REGISTRY, "registry_person_url_allocate('%s', '%s', '%s'): allocating %zu bytes", p->guid, m->guid, u->url, sizeof(REGISTRY_PERSON_URL) + namelen);
-
-    // protection from too big names
-    if(namelen > registry.max_name_length)
-        namelen = registry.max_name_length;
-
-    REGISTRY_PERSON_URL *pu = mallocz(sizeof(REGISTRY_PERSON_URL) + namelen);
-
-    // a simple strcpy() should do the job
-    // but I prefer to be safe, since the caller specified urllen
-    strncpyz(pu->machine_name, name, namelen);
-
-    pu->machine = m;
-    pu->first_t = pu->last_t = (uint32_t)when;
-    pu->usages = 1;
-    pu->url = u;
-    pu->flags = REGISTRY_URL_FLAGS_DEFAULT;
-    m->links++;
-
-    registry.persons_urls_memory += sizeof(REGISTRY_PERSON_URL) + namelen;
-
-    debug(D_REGISTRY, "registry_person_url_allocate('%s', '%s', '%s'): indexing URL in person", p->guid, m->guid, u->url);
-    REGISTRY_PERSON_URL *tpu = registry_person_url_index_add(p, pu);
-    if(tpu != pu) {
-        error("Registry: Attempted to add duplicate person url '%s' with name '%s' to person '%s'", u->url, name, p->guid);
-        free(pu);
-        pu = tpu;
-    }
-    else
-        registry_url_link(u);
-
-    return pu;
-}
-
-void registry_person_url_free(REGISTRY_PERSON *p, REGISTRY_PERSON_URL *pu) {
-    debug(D_REGISTRY, "registry_person_url_free('%s', '%s')", p->guid, pu->url->url);
-
-    REGISTRY_PERSON_URL *tpu = registry_person_url_index_del(p, pu);
-    if(tpu) {
-        registry_url_unlink(tpu->url);
-        tpu->machine->links--;
-        registry.persons_urls_memory -= sizeof(REGISTRY_PERSON_URL) + strlen(tpu->machine_name);
-        freez(tpu);
-    }
-}
-
-// this function is needed to change the name of a PERSON_URL
-REGISTRY_PERSON_URL *registry_person_url_reallocate(REGISTRY_PERSON *p, REGISTRY_MACHINE *m, REGISTRY_URL *u, char *name, size_t namelen, time_t when, REGISTRY_PERSON_URL *pu) {
-    debug(D_REGISTRY, "registry_person_url_reallocate('%s', '%s', '%s'): allocating %zu bytes", p->guid, m->guid, u->url, sizeof(REGISTRY_PERSON_URL) + namelen);
-
-    // keep a backup
-    REGISTRY_PERSON_URL pu2 = {
-            .first_t = pu->first_t,
-            .last_t = pu->last_t,
-            .usages = pu->usages,
-            .flags = pu->flags,
-            .machine = pu->machine,
-            .machine_name = ""
-    };
-
-    // remove the existing one from the index
-    registry_person_url_free(p, pu);
-    pu = &pu2;
-
-    // allocate a new one
-    REGISTRY_PERSON_URL *tpu = registry_person_url_allocate(p, m, u, name, namelen, when);
-    tpu->first_t = pu->first_t;
-    tpu->last_t = pu->last_t;
-    tpu->usages = pu->usages;
-    tpu->flags = pu->flags;
-
-    return tpu;
-}
-
-
-// ----------------------------------------------------------------------------
-// PERSON
-
-REGISTRY_PERSON *registry_person_find(const char *person_guid) {
-    debug(D_REGISTRY, "Registry: registry_person_find('%s')", person_guid);
-    return dictionary_get(registry.persons, person_guid);
-}
-
-REGISTRY_PERSON *registry_person_allocate(const char *person_guid, time_t when) {
-    debug(D_REGISTRY, "Registry: registry_person_allocate('%s'): allocating new person, sizeof(PERSON)=%zu", (person_guid)?person_guid:"", sizeof(REGISTRY_PERSON));
-
-    REGISTRY_PERSON *p = mallocz(sizeof(REGISTRY_PERSON));
-    if(!person_guid) {
-        for(;;) {
-            uuid_t uuid;
-            uuid_generate(uuid);
-            uuid_unparse_lower(uuid, p->guid);
-
-            debug(D_REGISTRY, "Registry: Checking if the generated person guid '%s' is unique", p->guid);
-            if (!dictionary_get(registry.persons, p->guid)) {
-                debug(D_REGISTRY, "Registry: generated person guid '%s' is unique", p->guid);
-                break;
-            }
-            else
-                info("Registry: generated person guid '%s' found in the registry. Retrying...", p->guid);
-        }
-    }
-    else
-        strncpyz(p->guid, person_guid, GUID_LEN);
-
-    debug(D_REGISTRY, "Registry: registry_person_allocate('%s'): creating dictionary of urls", p->guid);
-    avl_init(&p->person_urls, person_url_compare);
-
-    p->first_t = p->last_t = (uint32_t)when;
-    p->usages = 0;
-
-    registry.persons_memory += sizeof(REGISTRY_PERSON);
-
-    registry.persons_count++;
-    dictionary_set(registry.persons, p->guid, p, sizeof(REGISTRY_PERSON));
-
-    return p;
-}
-
-
-// 1. validate person GUID
-// 2. if it is valid, find it
-// 3. if it is not valid, create a new one
-// 4. return it
-REGISTRY_PERSON *registry_person_get(const char *person_guid, time_t when) {
-    debug(D_REGISTRY, "Registry: registry_person_get('%s'): creating dictionary of urls", person_guid);
-
-    REGISTRY_PERSON *p = NULL;
-
-    if(person_guid && *person_guid) {
-        char buf[GUID_LEN + 1];
-        // validate it is a GUID
-        if(unlikely(regenerate_guid(person_guid, buf) == -1))
-            info("Registry: person guid '%s' is not a valid guid. Ignoring it.", person_guid);
-        else {
-            person_guid = buf;
-            p = registry_person_find(person_guid);
-        }
-    }
-
-    if(!p) p = registry_person_allocate(NULL, when);
-
-    return p;
-}
-
-void registry_person_del(REGISTRY_PERSON *p) {
-    debug(D_REGISTRY, "Registry: registry_person_del('%s'): creating dictionary of urls", p->guid);
-
-    while(p->person_urls.root)
-        registry_person_unlink_from_url(p, (REGISTRY_PERSON_URL *)p->person_urls.root);
-
-    debug(D_REGISTRY, "Registry: deleting person '%s' from persons registry", p->guid);
-    dictionary_del(registry.persons, p->guid);
-
-    debug(D_REGISTRY, "Registry: freeing person '%s'", p->guid);
-    freez(p);
-}
-
-// ----------------------------------------------------------------------------
-// LINKING OF OBJECTS
-
-REGISTRY_PERSON_URL *registry_person_link_to_url(REGISTRY_PERSON *p, REGISTRY_MACHINE *m, REGISTRY_URL *u, char *name, size_t namelen, time_t when) {
-    debug(D_REGISTRY, "registry_person_link_to_url('%s', '%s', '%s'): searching for URL in person", p->guid, m->guid, u->url);
-
-    REGISTRY_PERSON_URL *pu = registry_person_url_index_find(p, u->url);
-    if(!pu) {
-        debug(D_REGISTRY, "registry_person_link_to_url('%s', '%s', '%s'): not found", p->guid, m->guid, u->url);
-        pu = registry_person_url_allocate(p, m, u, name, namelen, when);
-        registry.persons_urls_count++;
-    }
-    else {
-        debug(D_REGISTRY, "registry_person_link_to_url('%s', '%s', '%s'): found", p->guid, m->guid, u->url);
-        pu->usages++;
-        if(likely(pu->last_t < (uint32_t)when)) pu->last_t = (uint32_t)when;
-
-        if(pu->machine != m) {
-            REGISTRY_MACHINE_URL *mu = dictionary_get(pu->machine->machine_urls, u->url);
-            if(mu) {
-                debug(D_REGISTRY, "registry_person_link_to_url('%s', '%s', '%s'): URL switched machines (old was '%s') - expiring it from previous machine.",
-                     p->guid, m->guid, u->url, pu->machine->guid);
-                mu->flags |= REGISTRY_URL_FLAGS_EXPIRED;
-            }
-            else {
-                debug(D_REGISTRY, "registry_person_link_to_url('%s', '%s', '%s'): URL switched machines (old was '%s') - but the URL is not linked to the old machine.",
-                     p->guid, m->guid, u->url, pu->machine->guid);
-            }
-
-            pu->machine->links--;
-            pu->machine = m;
-        }
-
-        if(strcmp(pu->machine_name, name) != 0) {
-            // the name of the PERSON_URL has changed !
-            pu = registry_person_url_reallocate(p, m, u, name, namelen, when, pu);
-        }
-    }
-
-    p->usages++;
-    if(likely(p->last_t < (uint32_t)when)) p->last_t = (uint32_t)when;
-
-    if(pu->flags & REGISTRY_URL_FLAGS_EXPIRED) {
-        debug(D_REGISTRY, "registry_person_link_to_url('%s', '%s', '%s'): accessing an expired URL. Re-enabling URL.", p->guid, m->guid, u->url);
-        pu->flags &= ~REGISTRY_URL_FLAGS_EXPIRED;
-    }
-
-    return pu;
-}
-
-void registry_person_unlink_from_url(REGISTRY_PERSON *p, REGISTRY_PERSON_URL *pu) {
-    registry_person_url_free(p, pu);
-}