/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <config.h>
-#include "file-handle-def.h"
+#include "data/file-handle-def.h"
#include <assert.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
-#include <libpspp/compiler.h>
-#include <libpspp/hash.h>
-#include <libpspp/ll.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <data/file-name.h>
-#include <data/variable.h>
-#include <data/scratch-handle.h>
+#include "libpspp/compiler.h"
+#include "libpspp/hmap.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "libpspp/hash-functions.h"
+#include "data/file-name.h"
+#include "data/variable.h"
+#include "data/scratch-handle.h"
-#include "xalloc.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
/* File handle. */
struct file_handle
{
- struct ll ll; /* Element in global list. */
+ struct hmap_node name_node; /* Element in named_handles hmap. */
size_t ref_cnt; /* Number of references. */
char *id; /* Identifier token, NULL if none. */
char *name; /* User-friendly identifying name. */
struct scratch_handle *sh; /* Scratch file data. */
};
-static struct file_handle *
-file_handle_from_ll (struct ll *ll)
-{
- return ll_data (ll, struct file_handle, ll);
-}
-
-/* List of all named handles. */
-static struct ll_list named_handles;
+/* All "struct file_handle"s with nonnull 'id' member. */
+static struct hmap named_handles = HMAP_INITIALIZER (named_handles);
/* Default file handle for DATA LIST, REREAD, REPEATING DATA
commands. */
static void free_handle (struct file_handle *);
static void unname_handle (struct file_handle *);
+/* Hash table of all active locks. */
+static struct hmap locks = HMAP_INITIALIZER (locks);
+
/* File handle initialization routine. */
void
fh_init (void)
{
- ll_init (&named_handles);
inline_file = create_handle ("INLINE", xstrdup ("INLINE"), FH_REF_INLINE);
inline_file->record_width = 80;
inline_file->tab_width = 8;
void
fh_done (void)
{
- while (!ll_is_empty (&named_handles))
- unname_handle (file_handle_from_ll (ll_head (&named_handles)));
+ struct file_handle *handle, *next;
+
+ HMAP_FOR_EACH_SAFE (handle, next,
+ struct file_handle, name_node, &named_handles)
+ unname_handle (handle);
}
/* Free HANDLE and remove it from the global list. */
{
/* Remove handle from global list. */
if (handle->id != NULL)
- ll_remove (&handle->ll);
+ hmap_delete (&named_handles, &handle->name_node);
/* Free data. */
free (handle->id);
assert (handle->id != NULL);
free (handle->id);
handle->id = NULL;
- ll_remove (&handle->ll);
+ hmap_delete (&named_handles, &handle->name_node);
/* Drop the reference held by the named_handles table. */
fh_unref (handle);
{
struct file_handle *handle;
- ll_for_each (handle, struct file_handle, ll, &named_handles)
+ HMAP_FOR_EACH_WITH_HASH (handle, struct file_handle, name_node,
+ hash_case_string (id, 0), &named_handles)
if (!strcasecmp (id, handle->id))
{
handle->ref_cnt++;
if (id != NULL)
{
assert (fh_from_id (id) == NULL);
- ll_push_tail (&named_handles, &handle->ll);
+ hmap_insert (&named_handles, &handle->name_node,
+ hash_case_string (handle->id, 0));
handle->ref_cnt++;
}
char *handle_name;
struct file_handle *handle;
- handle_name = id != NULL ? xstrdup (id) : xasprintf ("\"%s\"", file_name);
+ handle_name = id != NULL ? xstrdup (id) : xasprintf ("`%s'", file_name);
handle = create_handle (id, handle_name, FH_REF_FILE);
handle->file_name = xstrdup (file_name);
handle->mode = properties->mode;
fh_default_properties (void)
{
static const struct fh_properties default_properties
- = {FH_MODE_TEXT, 1024, 4, LEGACY_NATIVE};
+ = {FH_MODE_TEXT, 1024, 4, C_ENCODING};
return &default_properties;
}
fh_get_legacy_encoding (const struct file_handle *handle)
{
assert (handle->referent & (FH_REF_FILE | FH_REF_INLINE));
- return (handle->referent == FH_REF_FILE ? handle->encoding : LEGACY_NATIVE);
+ return (handle->referent == FH_REF_FILE ? handle->encoding : C_ENCODING);
}
/* Returns the scratch file handle associated with HANDLE.
/* Information about a file handle's readers or writers. */
struct fh_lock
{
+ struct hmap_node node; /* hmap_node member. */
+
/* Hash key. */
enum fh_referent referent; /* Type of underlying file. */
union
void *aux; /* Owner's auxiliary data. */
};
-/* Hash table of all active locks. */
-static struct hsh_table *locks;
static void make_key (struct fh_lock *, const struct file_handle *,
enum fh_access);
static void free_key (struct fh_lock *);
-static int compare_fh_locks (const void *, const void *, const void *);
-static unsigned int hash_fh_lock (const void *, const void *);
+static int compare_fh_locks (const struct fh_lock *a, const struct fh_lock *b);
+static unsigned int hash_fh_lock (const struct fh_lock *lock);
/* Tries to lock handle H for the given kind of ACCESS and TYPE
of file. Returns a pointer to a struct fh_lock if successful,
fh_lock (struct file_handle *h, enum fh_referent mask UNUSED,
const char *type, enum fh_access access, bool exclusive)
{
- struct fh_lock key, *lock;
- void **lockp;
+ struct fh_lock *key = NULL;
+ size_t hash ;
+ struct fh_lock *lock = NULL;
+ bool found_lock = false;
assert ((fh_get_referent (h) & mask) != 0);
assert (access == FH_ACC_READ || access == FH_ACC_WRITE);
- if (locks == NULL)
- locks = hsh_create (0, compare_fh_locks, hash_fh_lock, NULL, NULL);
+ key = xmalloc (sizeof *key);
+
+ make_key (key, h, access);
- make_key (&key, h, access);
- lockp = hsh_probe (locks, &key);
- if (*lockp == NULL)
+ key->open_cnt = 1;
+ key->exclusive = exclusive;
+ key->type = type;
+ key->aux = NULL;
+
+ hash = hash_fh_lock (key);
+
+ HMAP_FOR_EACH_WITH_HASH (lock, struct fh_lock, node, hash, &locks)
{
- lock = *lockp = xmalloc (sizeof *lock);
- *lock = key;
- lock->open_cnt = 1;
- lock->exclusive = exclusive;
- lock->type = type;
- lock->aux = NULL;
+ if ( 0 == compare_fh_locks (lock, key))
+ {
+ found_lock = true;
+ break;
+ }
}
- else
- {
- free_key (&key);
- lock = *lockp;
+ if ( found_lock )
+ {
if (strcmp (lock->type, type))
{
if (access == FH_ACC_READ)
return NULL;
}
lock->open_cnt++;
+
+ free_key (key);
+ free (key);
+
+ return lock;
}
- return lock;
+ hmap_insert (&locks, &key->node, hash);
+ found_lock = false;
+ HMAP_FOR_EACH_WITH_HASH (lock, struct fh_lock, node, hash, &locks)
+ {
+ if ( 0 == compare_fh_locks (lock, key))
+ {
+ found_lock = true;
+ break;
+ }
+ }
+
+ assert (found_lock);
+
+ return key;
}
/* Releases LOCK that was acquired with fh_lock.
assert (lock->open_cnt > 0);
if (--lock->open_cnt == 0)
{
- hsh_delete (locks, lock);
+ hmap_delete (&locks, &lock->node);
free_key (lock);
free (lock);
return false;
fh_is_locked (const struct file_handle *handle, enum fh_access access)
{
struct fh_lock key;
- bool is_locked;
+ const struct fh_lock *k = NULL;
+ bool is_locked = false;
+ size_t hash ;
make_key (&key, handle, access);
- is_locked = hsh_find (locks, &key) != NULL;
+
+ hash = hash_fh_lock (&key);
+
+
+ HMAP_FOR_EACH_WITH_HASH (k, struct fh_lock, node, hash, &locks)
+ {
+ if ( 0 == compare_fh_locks (k, &key))
+ {
+ is_locked = true;
+ break;
+ }
+ }
+
free_key (&key);
return is_locked;
/* Compares the key fields in struct fh_lock objects A and B and
returns a strcmp()-type result. */
static int
-compare_fh_locks (const void *a_, const void *b_, const void *aux UNUSED)
+compare_fh_locks (const struct fh_lock *a, const struct fh_lock *b)
{
- const struct fh_lock *a = a_;
- const struct fh_lock *b = b_;
-
if (a->referent != b->referent)
return a->referent < b->referent ? -1 : 1;
else if (a->access != b->access)
/* Returns a hash value for LOCK. */
static unsigned int
-hash_fh_lock (const void *lock_, const void *aux UNUSED)
+hash_fh_lock (const struct fh_lock *lock)
{
- const struct fh_lock *lock = lock_;
unsigned int basis;
if (lock->referent == FH_REF_FILE)
basis = fn_hash_identity (lock->u.file);
projects / pspp-builds.git / blobdiff