mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-10-06 16:47:27 +00:00
compositor: Pull in hash table from protocol
We use it in the X WM implementation, but we don't want it in the core libraries.
This commit is contained in:
Kristian Høgsberg
parent
e7aaec301a
commit
11d0512ce9
|
|
@ -27,7 +27,9 @@ if ENABLE_XSERVER_LAUNCHER
|
|||
xserver_launcher_sources = \
|
||||
xserver-launcher.c \
|
||||
xserver-protocol.c \
|
||||
xserver-server-protocol.h
|
||||
xserver-server-protocol.h \
|
||||
hash.c \
|
||||
hash.h
|
||||
endif
|
||||
|
||||
moduledir = @libdir@/wayland
|
||||
|
|
|
|||
307
compositor/hash.c
Normal file
307
compositor/hash.c
Normal file
|
|
@ -0,0 +1,307 @@
|
|||
/*
|
||||
* Copyright © 2009 Intel Corporation
|
||||
* Copyright © 1988-2004 Keith Packard and Bart Massey.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*
|
||||
* Except as contained in this notice, the names of the authors
|
||||
* or their institutions shall not be used in advertising or
|
||||
* otherwise to promote the sale, use or other dealings in this
|
||||
* Software without prior written authorization from the
|
||||
* authors.
|
||||
*
|
||||
* Authors:
|
||||
* Eric Anholt <eric@anholt.net>
|
||||
* Keith Packard <keithp@keithp.com>
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "hash.h"
|
||||
|
||||
struct hash_entry {
|
||||
uint32_t hash;
|
||||
void *data;
|
||||
};
|
||||
|
||||
struct hash_table {
|
||||
struct hash_entry *table;
|
||||
uint32_t size;
|
||||
uint32_t rehash;
|
||||
uint32_t max_entries;
|
||||
uint32_t size_index;
|
||||
uint32_t entries;
|
||||
uint32_t deleted_entries;
|
||||
};
|
||||
|
||||
#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
|
||||
|
||||
/*
|
||||
* From Knuth -- a good choice for hash/rehash values is p, p-2 where
|
||||
* p and p-2 are both prime. These tables are sized to have an extra 10%
|
||||
* free to avoid exponential performance degradation as the hash table fills
|
||||
*/
|
||||
|
||||
static const uint32_t deleted_data;
|
||||
|
||||
static const struct {
|
||||
uint32_t max_entries, size, rehash;
|
||||
} hash_sizes[] = {
|
||||
{ 2, 5, 3 },
|
||||
{ 4, 7, 5 },
|
||||
{ 8, 13, 11 },
|
||||
{ 16, 19, 17 },
|
||||
{ 32, 43, 41 },
|
||||
{ 64, 73, 71 },
|
||||
{ 128, 151, 149 },
|
||||
{ 256, 283, 281 },
|
||||
{ 512, 571, 569 },
|
||||
{ 1024, 1153, 1151 },
|
||||
{ 2048, 2269, 2267 },
|
||||
{ 4096, 4519, 4517 },
|
||||
{ 8192, 9013, 9011 },
|
||||
{ 16384, 18043, 18041 },
|
||||
{ 32768, 36109, 36107 },
|
||||
{ 65536, 72091, 72089 },
|
||||
{ 131072, 144409, 144407 },
|
||||
{ 262144, 288361, 288359 },
|
||||
{ 524288, 576883, 576881 },
|
||||
{ 1048576, 1153459, 1153457 },
|
||||
{ 2097152, 2307163, 2307161 },
|
||||
{ 4194304, 4613893, 4613891 },
|
||||
{ 8388608, 9227641, 9227639 },
|
||||
{ 16777216, 18455029, 18455027 },
|
||||
{ 33554432, 36911011, 36911009 },
|
||||
{ 67108864, 73819861, 73819859 },
|
||||
{ 134217728, 147639589, 147639587 },
|
||||
{ 268435456, 295279081, 295279079 },
|
||||
{ 536870912, 590559793, 590559791 },
|
||||
{ 1073741824, 1181116273, 1181116271},
|
||||
{ 2147483648ul, 2362232233ul, 2362232231ul}
|
||||
};
|
||||
|
||||
static int
|
||||
entry_is_free(struct hash_entry *entry)
|
||||
{
|
||||
return entry->data == NULL;
|
||||
}
|
||||
|
||||
static int
|
||||
entry_is_deleted(struct hash_entry *entry)
|
||||
{
|
||||
return entry->data == &deleted_data;
|
||||
}
|
||||
|
||||
static int
|
||||
entry_is_present(struct hash_entry *entry)
|
||||
{
|
||||
return entry->data != NULL && entry->data != &deleted_data;
|
||||
}
|
||||
|
||||
struct hash_table *
|
||||
hash_table_create(void)
|
||||
{
|
||||
struct hash_table *ht;
|
||||
|
||||
ht = malloc(sizeof(*ht));
|
||||
if (ht == NULL)
|
||||
return NULL;
|
||||
|
||||
ht->size_index = 0;
|
||||
ht->size = hash_sizes[ht->size_index].size;
|
||||
ht->rehash = hash_sizes[ht->size_index].rehash;
|
||||
ht->max_entries = hash_sizes[ht->size_index].max_entries;
|
||||
ht->table = calloc(ht->size, sizeof(*ht->table));
|
||||
ht->entries = 0;
|
||||
ht->deleted_entries = 0;
|
||||
|
||||
if (ht->table == NULL) {
|
||||
free(ht);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return ht;
|
||||
}
|
||||
|
||||
/**
|
||||
* Frees the given hash table.
|
||||
*/
|
||||
void
|
||||
hash_table_destroy(struct hash_table *ht)
|
||||
{
|
||||
if (!ht)
|
||||
return;
|
||||
|
||||
free(ht->table);
|
||||
free(ht);
|
||||
}
|
||||
|
||||
/**
|
||||
* Finds a hash table entry with the given key and hash of that key.
|
||||
*
|
||||
* Returns NULL if no entry is found. Note that the data pointer may be
|
||||
* modified by the user.
|
||||
*/
|
||||
static void *
|
||||
hash_table_search(struct hash_table *ht, uint32_t hash)
|
||||
{
|
||||
uint32_t hash_address;
|
||||
|
||||
hash_address = hash % ht->size;
|
||||
do {
|
||||
uint32_t double_hash;
|
||||
|
||||
struct hash_entry *entry = ht->table + hash_address;
|
||||
|
||||
if (entry_is_free(entry)) {
|
||||
return NULL;
|
||||
} else if (entry_is_present(entry) && entry->hash == hash) {
|
||||
return entry;
|
||||
}
|
||||
|
||||
double_hash = 1 + hash % ht->rehash;
|
||||
|
||||
hash_address = (hash_address + double_hash) % ht->size;
|
||||
} while (hash_address != hash % ht->size);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void
|
||||
hash_table_for_each(struct hash_table *ht,
|
||||
hash_table_iterator_func_t func, void *data)
|
||||
{
|
||||
struct hash_entry *entry;
|
||||
uint32_t i;
|
||||
|
||||
for (i = 0; i < ht->size; i++) {
|
||||
entry = ht->table + i;
|
||||
if (entry_is_present(entry))
|
||||
func(entry->data, data);
|
||||
}
|
||||
}
|
||||
|
||||
void *
|
||||
hash_table_lookup(struct hash_table *ht, uint32_t hash)
|
||||
{
|
||||
struct hash_entry *entry;
|
||||
|
||||
entry = hash_table_search(ht, hash);
|
||||
if (entry != NULL)
|
||||
return entry->data;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
hash_table_rehash(struct hash_table *ht, int new_size_index)
|
||||
{
|
||||
struct hash_table old_ht;
|
||||
struct hash_entry *table, *entry;
|
||||
|
||||
if (new_size_index >= ARRAY_SIZE(hash_sizes))
|
||||
return;
|
||||
|
||||
table = calloc(hash_sizes[new_size_index].size, sizeof(*ht->table));
|
||||
if (table == NULL)
|
||||
return;
|
||||
|
||||
old_ht = *ht;
|
||||
|
||||
ht->table = table;
|
||||
ht->size_index = new_size_index;
|
||||
ht->size = hash_sizes[ht->size_index].size;
|
||||
ht->rehash = hash_sizes[ht->size_index].rehash;
|
||||
ht->max_entries = hash_sizes[ht->size_index].max_entries;
|
||||
ht->entries = 0;
|
||||
ht->deleted_entries = 0;
|
||||
|
||||
for (entry = old_ht.table;
|
||||
entry != old_ht.table + old_ht.size;
|
||||
entry++) {
|
||||
if (entry_is_present(entry)) {
|
||||
hash_table_insert(ht, entry->hash, entry->data);
|
||||
}
|
||||
}
|
||||
|
||||
free(old_ht.table);
|
||||
}
|
||||
|
||||
/**
|
||||
* Inserts the data with the given hash into the table.
|
||||
*
|
||||
* Note that insertion may rearrange the table on a resize or rehash,
|
||||
* so previously found hash_entries are no longer valid after this function.
|
||||
*/
|
||||
int
|
||||
hash_table_insert(struct hash_table *ht, uint32_t hash, void *data)
|
||||
{
|
||||
uint32_t hash_address;
|
||||
|
||||
if (ht->entries >= ht->max_entries) {
|
||||
hash_table_rehash(ht, ht->size_index + 1);
|
||||
} else if (ht->deleted_entries + ht->entries >= ht->max_entries) {
|
||||
hash_table_rehash(ht, ht->size_index);
|
||||
}
|
||||
|
||||
hash_address = hash % ht->size;
|
||||
do {
|
||||
struct hash_entry *entry = ht->table + hash_address;
|
||||
uint32_t double_hash;
|
||||
|
||||
if (!entry_is_present(entry)) {
|
||||
if (entry_is_deleted(entry))
|
||||
ht->deleted_entries--;
|
||||
entry->hash = hash;
|
||||
entry->data = data;
|
||||
ht->entries++;
|
||||
return 0;
|
||||
}
|
||||
|
||||
double_hash = 1 + hash % ht->rehash;
|
||||
|
||||
hash_address = (hash_address + double_hash) % ht->size;
|
||||
} while (hash_address != hash % ht->size);
|
||||
|
||||
/* We could hit here if a required resize failed. An unchecked-malloc
|
||||
* application could ignore this result.
|
||||
*/
|
||||
return -1;
|
||||
}
|
||||
|
||||
/**
|
||||
* This function deletes the given hash table entry.
|
||||
*
|
||||
* Note that deletion doesn't otherwise modify the table, so an iteration over
|
||||
* the table deleting entries is safe.
|
||||
*/
|
||||
void
|
||||
hash_table_remove(struct hash_table *ht, uint32_t hash)
|
||||
{
|
||||
struct hash_entry *entry;
|
||||
|
||||
entry = hash_table_search(ht, hash);
|
||||
if (entry != NULL) {
|
||||
entry->data = (void *) &deleted_data;
|
||||
ht->entries--;
|
||||
ht->deleted_entries++;
|
||||
}
|
||||
}
|
||||
49
compositor/hash.h
Normal file
49
compositor/hash.h
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
/*
|
||||
* Copyright © 2009 Intel Corporation
|
||||
* Copyright © 1988-2004 Keith Packard and Bart Massey.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*
|
||||
* Except as contained in this notice, the names of the authors
|
||||
* or their institutions shall not be used in advertising or
|
||||
* otherwise to promote the sale, use or other dealings in this
|
||||
* Software without prior written authorization from the
|
||||
* authors.
|
||||
*
|
||||
* Authors:
|
||||
* Eric Anholt <eric@anholt.net>
|
||||
* Keith Packard <keithp@keithp.com>
|
||||
*/
|
||||
|
||||
#ifndef HASH_H
|
||||
#define HASH_H
|
||||
|
||||
struct hash_table;
|
||||
struct hash_table *hash_table_create(void);
|
||||
typedef void (*hash_table_iterator_func_t)(void *element, void *data);
|
||||
|
||||
void hash_table_destroy(struct hash_table *ht);
|
||||
void *hash_table_lookup(struct hash_table *ht, uint32_t hash);
|
||||
int hash_table_insert(struct hash_table *ht, uint32_t hash, void *data);
|
||||
void hash_table_remove(struct hash_table *ht, uint32_t hash);
|
||||
void hash_table_for_each(struct hash_table *ht,
|
||||
hash_table_iterator_func_t func, void *data);
|
||||
|
||||
#endif
|
||||
|
|
@ -39,6 +39,7 @@
|
|||
|
||||
#include "compositor.h"
|
||||
#include "xserver-server-protocol.h"
|
||||
#include "hash.h"
|
||||
|
||||
/*
|
||||
* TODO:
|
||||
|
|
@ -74,7 +75,7 @@ struct wlsc_wm {
|
|||
const xcb_query_extension_reply_t *xfixes;
|
||||
struct wl_event_source *source;
|
||||
xcb_screen_t *screen;
|
||||
struct wl_hash_table *window_hash;
|
||||
struct hash_table *window_hash;
|
||||
struct wlsc_xserver *server;
|
||||
|
||||
xcb_window_t selection_window;
|
||||
|
|
@ -552,7 +553,7 @@ wlsc_wm_handle_map_notify(struct wlsc_wm *wm, xcb_generic_event_t *event)
|
|||
|
||||
wlsc_wm_get_properties(wm, map_notify->window);
|
||||
|
||||
window = wl_hash_table_lookup(wm->window_hash, map_notify->window);
|
||||
window = hash_table_lookup(wm->window_hash, map_notify->window);
|
||||
wlsc_wm_activate(wm, window, XCB_TIME_CURRENT_TIME);
|
||||
}
|
||||
|
||||
|
|
@ -606,7 +607,7 @@ wlsc_wm_handle_create_notify(struct wlsc_wm *wm, xcb_generic_event_t *event)
|
|||
}
|
||||
|
||||
window->id = create_notify->window;
|
||||
wl_hash_table_insert(wm->window_hash, window->id, window);
|
||||
hash_table_insert(wm->window_hash, window->id, window);
|
||||
|
||||
fprintf(stderr, "created window %p\n", window);
|
||||
}
|
||||
|
|
@ -621,7 +622,7 @@ wlsc_wm_handle_destroy_notify(struct wlsc_wm *wm, xcb_generic_event_t *event)
|
|||
fprintf(stderr, "XCB_DESTROY_NOTIFY, win %d\n",
|
||||
destroy_notify->window);
|
||||
|
||||
window = wl_hash_table_lookup(wm->window_hash, destroy_notify->window);
|
||||
window = hash_table_lookup(wm->window_hash, destroy_notify->window);
|
||||
if (window == NULL) {
|
||||
fprintf(stderr, "destroy notify for unknow window %d\n",
|
||||
destroy_notify->window);
|
||||
|
|
@ -629,7 +630,7 @@ wlsc_wm_handle_destroy_notify(struct wlsc_wm *wm, xcb_generic_event_t *event)
|
|||
}
|
||||
|
||||
fprintf(stderr, "destroy window %p\n", window);
|
||||
wl_hash_table_remove(wm->window_hash, window->id);
|
||||
hash_table_remove(wm->window_hash, window->id);
|
||||
free(window);
|
||||
}
|
||||
|
||||
|
|
@ -805,7 +806,7 @@ wlsc_wm_create(struct wlsc_xserver *wxs)
|
|||
return NULL;
|
||||
|
||||
wm->server = wxs;
|
||||
wm->window_hash = wl_hash_table_create();
|
||||
wm->window_hash = hash_table_create();
|
||||
if (wm->window_hash == NULL) {
|
||||
free(wm);
|
||||
return NULL;
|
||||
|
|
@ -813,7 +814,7 @@ wlsc_wm_create(struct wlsc_xserver *wxs)
|
|||
|
||||
if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sv) < 0) {
|
||||
fprintf(stderr, "socketpair failed\n");
|
||||
wl_hash_table_destroy(wm->window_hash);
|
||||
hash_table_destroy(wm->window_hash);
|
||||
free(wm);
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -827,7 +828,7 @@ wlsc_wm_create(struct wlsc_xserver *wxs)
|
|||
if (xcb_connection_has_error(wm->conn)) {
|
||||
fprintf(stderr, "xcb_connect_to_fd failed\n");
|
||||
close(sv[0]);
|
||||
wl_hash_table_destroy(wm->window_hash);
|
||||
hash_table_destroy(wm->window_hash);
|
||||
free(wm);
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -883,7 +884,7 @@ static void
|
|||
wlsc_wm_destroy(struct wlsc_wm *wm)
|
||||
{
|
||||
/* FIXME: Free windows in hash. */
|
||||
wl_hash_table_destroy(wm->window_hash);
|
||||
hash_table_destroy(wm->window_hash);
|
||||
xcb_disconnect(wm->conn);
|
||||
wl_event_source_remove(wm->source);
|
||||
free(wm);
|
||||
|
|
@ -1042,7 +1043,7 @@ xserver_set_window_id(struct wl_client *client, struct wl_resource *resource,
|
|||
if (client != wxs->client)
|
||||
return;
|
||||
|
||||
window = wl_hash_table_lookup(wm->window_hash, id);
|
||||
window = hash_table_lookup(wm->window_hash, id);
|
||||
if (window == NULL) {
|
||||
fprintf(stderr, "set_window_id for unknown window %d\n", id);
|
||||
return;
|
||||
|
|
|
|||
Loading…
Reference in a new issue