X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Ffile-handle-def.c;h=9c853e5e983d7968bf427e0a01765680c1cec0e0;hb=0755b9a4256554906377f2db62e25ac09255a790;hp=6ed3f8f9f95205158cbf2a33227e5dbec6a81529;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp diff --git a/src/data/file-handle-def.c b/src/data/file-handle-def.c index 6ed3f8f9f9..9c853e5e98 100644 --- a/src/data/file-handle-def.c +++ b/src/data/file-handle-def.c @@ -1,5 +1,5 @@ /* 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, 2012, 2013 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 @@ -16,23 +16,25 @@ #include -#include "file-handle-def.h" +#include "data/file-handle-def.h" #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/dataset.h" +#include "data/file-name.h" +#include "data/variable.h" +#include "libpspp/cast.h" +#include "libpspp/compiler.h" +#include "libpspp/hash-functions.h" +#include "libpspp/hmap.h" +#include "libpspp/i18n.h" +#include "libpspp/message.h" +#include "libpspp/str.h" -#include "xalloc.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -40,7 +42,7 @@ /* 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. */ @@ -49,24 +51,19 @@ struct file_handle /* FH_REF_FILE only. */ char *file_name; /* File name as provided by user. */ enum fh_mode mode; /* File mode. */ - const char *encoding; /* File encoding. */ + enum fh_line_ends line_ends; /* Line ends for text files. */ /* FH_REF_FILE and FH_REF_INLINE only. */ size_t record_width; /* Length of fixed-format records. */ size_t tab_width; /* Tab width, 0=do not expand tabs. */ + char *encoding; /* Charset for contents. */ - /* FH_REF_SCRATCH only. */ - struct scratch_handle *sh; /* Scratch file data. */ + /* FH_REF_DATASET only. */ + struct dataset *ds; /* Dataset. */ }; -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. */ @@ -76,16 +73,20 @@ static struct file_handle *default_handle; static struct file_handle *inline_file; static struct file_handle *create_handle (const char *id, - char *name, enum fh_referent); + char *name, enum fh_referent, + const char *encoding); 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 = create_handle ("INLINE", xstrdup ("INLINE"), FH_REF_INLINE, + "Auto"); inline_file->record_width = 80; inline_file->tab_width = 8; } @@ -94,8 +95,11 @@ fh_init (void) 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. */ @@ -104,13 +108,13 @@ free_handle (struct file_handle *handle) { /* 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); free (handle->name); free (handle->file_name); - scratch_handle_destroy (handle->sh); + free (handle->encoding); free (handle); } @@ -123,7 +127,7 @@ unname_handle (struct file_handle *handle) 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); @@ -172,11 +176,11 @@ fh_from_id (const char *id) { struct file_handle *handle; - ll_for_each (handle, struct file_handle, ll, &named_handles) - if (!strcasecmp (id, handle->id)) + HMAP_FOR_EACH_WITH_HASH (handle, struct file_handle, name_node, + utf8_hash_case_string (id, 0), &named_handles) + if (!utf8_strcasecmp (id, handle->id)) { - handle->ref_cnt++; - return handle; + return fh_ref (handle); } return NULL; @@ -189,7 +193,8 @@ fh_from_id (const char *id) The new handle is not fully initialized. The caller is responsible for completing its initialization. */ static struct file_handle * -create_handle (const char *id, char *handle_name, enum fh_referent referent) +create_handle (const char *id, char *handle_name, enum fh_referent referent, + const char *encoding) { struct file_handle *handle = xzalloc (sizeof *handle); @@ -197,12 +202,12 @@ create_handle (const char *id, char *handle_name, enum fh_referent referent) handle->id = id != NULL ? xstrdup (id) : NULL; handle->name = handle_name; handle->referent = referent; + handle->encoding = xstrdup (encoding); if (id != NULL) { - assert (fh_from_id (id) == NULL); - ll_push_tail (&named_handles, &handle->ll); - handle->ref_cnt++; + hmap_insert (&named_handles, &handle->name_node, + utf8_hash_case_string (handle->id, 0)); } return handle; @@ -214,14 +219,13 @@ create_handle (const char *id, char *handle_name, enum fh_referent referent) struct file_handle * fh_inline_file (void) { - fh_ref (inline_file); return inline_file; } -/* Creates and returns a new file handle with the given ID, which - may be null. If it is non-null, it must be unique among - existing file identifiers. The new handle is associated with - file FILE_NAME and the given PROPERTIES. */ +/* Creates and returns a new file handle with the given ID, which may be null. + If it is non-null, it must be a UTF-8 encoded string that is unique among + existing file identifiers. The new handle is associated with file FILE_NAME + and the given PROPERTIES. */ struct file_handle * fh_create_file (const char *id, const char *file_name, const struct fh_properties *properties) @@ -229,25 +233,31 @@ fh_create_file (const char *id, const char *file_name, char *handle_name; struct file_handle *handle; - handle_name = id != NULL ? xstrdup (id) : xasprintf ("\"%s\"", file_name); - handle = create_handle (id, handle_name, FH_REF_FILE); + handle_name = id != NULL ? xstrdup (id) : xasprintf ("`%s'", file_name); + handle = create_handle (id, handle_name, FH_REF_FILE, properties->encoding); handle->file_name = xstrdup (file_name); handle->mode = properties->mode; + handle->line_ends = properties->line_ends; handle->record_width = properties->record_width; handle->tab_width = properties->tab_width; - handle->encoding = properties->encoding; return handle; } /* Creates a new file handle with the given ID, which must be unique among existing file identifiers. The new handle is - associated with a scratch file (initially empty). */ + associated with a dataset file (initially empty). */ struct file_handle * -fh_create_scratch (const char *id) +fh_create_dataset (struct dataset *ds) { + const char *name; struct file_handle *handle; - handle = create_handle (id, xstrdup (id), FH_REF_SCRATCH); - handle->sh = NULL; + + name = dataset_name (ds); + if (name[0] == '\0') + name = _("active dataset"); + + handle = create_handle (NULL, xstrdup (name), FH_REF_DATASET, C_ENCODING); + handle->ds = ds; return handle; } @@ -255,8 +265,14 @@ fh_create_scratch (const char *id) const struct fh_properties * fh_default_properties (void) { +#if defined _WIN32 || defined __WIN32__ +#define DEFAULT_LINE_ENDS FH_END_CRLF +#else +#define DEFAULT_LINE_ENDS FH_END_LF +#endif + static const struct fh_properties default_properties - = {FH_MODE_TEXT, 1024, 4, LEGACY_NATIVE}; + = {FH_MODE_TEXT, DEFAULT_LINE_ENDS, 1024, 4, (char *) "Auto"}; return &default_properties; } @@ -306,6 +322,15 @@ fh_get_mode (const struct file_handle *handle) return handle->mode; } +/* Returns the line ends of HANDLE, which must be a handle associated with a + file. */ +enum fh_line_ends +fh_get_line_ends (const struct file_handle *handle) +{ + assert (handle->referent == FH_REF_FILE); + return handle->line_ends; +} + /* Returns the width of a logical record on HANDLE. */ size_t fh_get_record_width (const struct file_handle *handle) @@ -326,35 +351,25 @@ fh_get_tab_width (const struct file_handle *handle) /* Returns the encoding of characters read from HANDLE. */ const char * -fh_get_legacy_encoding (const struct file_handle *handle) +fh_get_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->encoding; } -/* Returns the scratch file handle associated with HANDLE. - Applicable to only FH_REF_SCRATCH files. */ -struct scratch_handle * -fh_get_scratch_handle (const struct file_handle *handle) +/* Returns the dataset handle associated with HANDLE. + Applicable to only FH_REF_DATASET files. */ +struct dataset * +fh_get_dataset (const struct file_handle *handle) { - assert (handle->referent == FH_REF_SCRATCH); - return handle->sh; -} - -/* Sets SH to be the scratch file handle associated with HANDLE. - Applicable to only FH_REF_SCRATCH files. */ -void -fh_set_scratch_handle (struct file_handle *handle, struct scratch_handle *sh) -{ - assert (handle->referent == FH_REF_SCRATCH); - handle->sh = sh; + assert (handle->referent == FH_REF_DATASET); + return handle->ds; } /* Returns the current default handle. */ struct file_handle * fh_get_default_handle (void) { - return default_handle ? fh_ref (default_handle) : fh_inline_file (); + return default_handle ? default_handle : fh_inline_file (); } /* Sets NEW_DEFAULT_HANDLE as the default handle. */ @@ -363,7 +378,7 @@ fh_set_default_handle (struct file_handle *new_default_handle) { assert (new_default_handle == NULL || (new_default_handle->referent & (FH_REF_INLINE | FH_REF_FILE))); - if (default_handle != NULL) + if (default_handle != NULL && default_handle != inline_file) fh_unref (default_handle); default_handle = new_default_handle; if (default_handle != NULL) @@ -373,12 +388,14 @@ fh_set_default_handle (struct file_handle *new_default_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 { struct file_identity *file; /* FH_REF_FILE only. */ - unsigned int unique_id; /* FH_REF_SCRATCH only. */ + unsigned int unique_id; /* FH_REF_DATASET only. */ } u; enum fh_access access; /* Type of file access. */ @@ -392,14 +409,12 @@ struct fh_lock 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, @@ -431,31 +446,36 @@ struct fh_lock * 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); + + key->open_cnt = 1; + key->exclusive = exclusive; + key->type = type; + key->aux = NULL; - make_key (&key, h, access); - lockp = hsh_probe (locks, &key); - if (*lockp == 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) @@ -475,9 +495,27 @@ fh_lock (struct file_handle *h, enum fh_referent mask UNUSED, return NULL; } lock->open_cnt++; + + free_key (key); + free (key); + + 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; + } } - return lock; + assert (found_lock); + + return key; } /* Releases LOCK that was acquired with fh_lock. @@ -499,7 +537,7 @@ fh_unlock (struct fh_lock *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; @@ -532,10 +570,24 @@ bool 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; @@ -551,11 +603,8 @@ make_key (struct fh_lock *lock, const struct file_handle *h, lock->access = access; if (lock->referent == FH_REF_FILE) lock->u.file = fn_get_identity (fh_get_file_name (h)); - else if (lock->referent == FH_REF_SCRATCH) - { - struct scratch_handle *sh = fh_get_scratch_handle (h); - lock->u.unique_id = sh != NULL ? sh->unique_id : 0; - } + else if (lock->referent == FH_REF_DATASET) + lock->u.unique_id = dataset_seqno (fh_get_dataset (h)); } /* Frees the key fields in LOCK. */ @@ -569,18 +618,15 @@ free_key (struct fh_lock *lock) /* 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) return a->access < b->access ? -1 : 1; else if (a->referent == FH_REF_FILE) return fn_compare_file_identities (a->u.file, b->u.file); - else if (a->referent == FH_REF_SCRATCH) + else if (a->referent == FH_REF_DATASET) return (a->u.unique_id < b->u.unique_id ? -1 : a->u.unique_id > b->u.unique_id); else @@ -589,13 +635,12 @@ compare_fh_locks (const void *a_, const void *b_, const void *aux UNUSED) /* 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); - else if (lock->referent == FH_REF_SCRATCH) + else if (lock->referent == FH_REF_DATASET) basis = lock->u.unique_id; else basis = 0;