Skip to content

Commit

Permalink
all: Remove GSlice usage
Browse files Browse the repository at this point in the history 
It has been deprecated and maps to malloc/free nowadays.
  • Loading branch information
@michaelkuhn
michaelkuhn committed Feb 2, 2024
1 parent 69a91b0 commit 38b71cd
Show file tree
Hide file tree
Showing 46 changed files with 199 additions and 202 deletions.
4 changes: 2 additions & 2 deletions backend/db/mysql.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ backend_init(gchar const* path, gpointer* backend_data)
return FALSE;
}

bd = g_slice_new(JMySQLData);
bd = g_new(JMySQLData, 1);
bd->db_host = g_strdup(split[0]);
bd->db_database = g_strdup(split[1]);
bd->db_user = g_strdup(split[2]);
Expand Down Expand Up @@ -722,7 +722,7 @@ backend_fini(gpointer backend_data)
g_free(bd->db_database);
g_free(bd->db_user);
g_free(bd->db_password);
g_slice_free(JMySQLData, bd);
g_free(bd);
}

static JBackend mysql_backend = {
Expand Down
4 changes: 2 additions & 2 deletions backend/db/sqlite.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ backend_init(gchar const* _path, gpointer* backend_data)

JSQLiteData* bd;

bd = g_slice_new(JSQLiteData);
bd = g_new(JSQLiteData, 1);
bd->path = g_strdup(_path);
bd->db = NULL;

Expand Down Expand Up @@ -501,7 +501,7 @@ backend_fini(gpointer backend_data)
}

g_free(bd->path);
g_slice_free(JSQLiteData, bd);
g_free(bd);
}

static JBackend sqlite_backend = {
Expand Down
14 changes: 7 additions & 7 deletions backend/kv/leveldb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ backend_batch_start(gpointer backend_data, gchar const* namespace, JSemantics* s
g_return_val_if_fail(namespace != NULL, FALSE);
g_return_val_if_fail(backend_batch != NULL, FALSE);

batch = g_slice_new(JLevelDBBatch);
batch = g_new(JLevelDBBatch, 1);

batch->batch = leveldb_writebatch_create();
batch->namespace = g_strdup(namespace);
Expand Down Expand Up @@ -98,7 +98,7 @@ backend_batch_execute(gpointer backend_data, gpointer backend_batch)
j_semantics_unref(batch->semantics);
g_free(batch->namespace);
leveldb_writebatch_destroy(batch->batch);
g_slice_free(JLevelDBBatch, batch);
g_free(batch);

return (leveldb_error == NULL);
}
Expand Down Expand Up @@ -182,7 +182,7 @@ backend_get_all(gpointer backend_data, gchar const* namespace, gpointer* backend

if (it != NULL)
{
iterator = g_slice_new(JLevelDBIterator);
iterator = g_new(JLevelDBIterator, 1);
iterator->iterator = it;
iterator->first = TRUE;
iterator->prefix = g_strdup_printf("%s:", namespace);
Expand All @@ -209,7 +209,7 @@ backend_get_by_prefix(gpointer backend_data, gchar const* namespace, gchar const

if (it != NULL)
{
iterator = g_slice_new(JLevelDBIterator);
iterator = g_new(JLevelDBIterator, 1);
iterator->iterator = it;
iterator->first = TRUE;
iterator->prefix = g_strdup_printf("%s:%s", namespace, prefix);
Expand Down Expand Up @@ -264,7 +264,7 @@ backend_iterate(gpointer backend_data, gpointer backend_iterator, gchar const**
out:
g_free(iterator->prefix);
leveldb_iter_destroy(iterator->iterator);
g_slice_free(JLevelDBIterator, iterator);
g_free(iterator);

return FALSE;
}
Expand All @@ -282,7 +282,7 @@ backend_init(gchar const* path, gpointer* backend_data)
dirname = g_path_get_dirname(path);
g_mkdir_with_parents(dirname, 0700);

bd = g_slice_new(JLevelDBData);
bd = g_new(JLevelDBData, 1);
bd->read_options = leveldb_readoptions_create();
bd->write_options = leveldb_writeoptions_create();
bd->write_options_sync = leveldb_writeoptions_create();
Expand Down Expand Up @@ -325,7 +325,7 @@ backend_fini(gpointer backend_data)
leveldb_close(bd->db);
}

g_slice_free(JLevelDBData, bd);
g_free(bd);
}

static JBackend leveldb_backend = {
Expand Down
16 changes: 8 additions & 8 deletions backend/kv/lmdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ backend_batch_start(gpointer backend_data, gchar const* namespace, JSemantics* s

if (mdb_txn_begin(bd->env, NULL, 0, &txn) == 0)
{
batch = g_slice_new(JLMDBBatch);
batch = g_new(JLMDBBatch, 1);
batch->txn = txn;
batch->namespace = g_strdup(namespace);
batch->semantics = j_semantics_ref(semantics);
Expand Down Expand Up @@ -98,7 +98,7 @@ backend_batch_execute(gpointer backend_data, gpointer data)

j_semantics_unref(batch->semantics);
g_free(batch->namespace);
g_slice_free(JLMDBBatch, batch);
g_free(batch);

return ret;
}
Expand Down Expand Up @@ -191,7 +191,7 @@ backend_get_all(gpointer backend_data, gchar const* namespace, gpointer* data)
g_return_val_if_fail(namespace != NULL, FALSE);
g_return_val_if_fail(data != NULL, FALSE);

iterator = g_slice_new(JLMDBIterator);
iterator = g_new(JLMDBIterator, 1);
iterator->first = TRUE;
iterator->prefix = g_strdup_printf("%s:", namespace);
iterator->namespace_len = strlen(namespace) + 1;
Expand All @@ -214,7 +214,7 @@ backend_get_by_prefix(gpointer backend_data, gchar const* namespace, gchar const
g_return_val_if_fail(prefix != NULL, FALSE);
g_return_val_if_fail(data != NULL, FALSE);

iterator = g_slice_new(JLMDBIterator);
iterator = g_new(JLMDBIterator, 1);
iterator->first = TRUE;
iterator->prefix = g_strdup_printf("%s:%s", namespace, prefix);
iterator->namespace_len = strlen(namespace) + 1;
Expand Down Expand Up @@ -271,7 +271,7 @@ backend_iterate(gpointer backend_data, gpointer data, gchar const** key, gconstp
mdb_txn_commit(iterator->txn);

g_free(iterator->prefix);
g_slice_free(JLMDBIterator, iterator);
g_free(iterator);

return FALSE;
}
Expand All @@ -286,7 +286,7 @@ backend_init(gchar const* path, gpointer* backend_data)

g_mkdir_with_parents(path, 0700);

bd = g_slice_new(JLMDBData);
bd = g_new(JLMDBData, 1);

if (mdb_env_create(&(bd->env)) == 0)
{
Expand Down Expand Up @@ -323,7 +323,7 @@ backend_init(gchar const* path, gpointer* backend_data)

error:
mdb_env_close(bd->env);
g_slice_free(JLMDBData, bd);
g_free(bd);

return FALSE;
}
Expand All @@ -338,7 +338,7 @@ backend_fini(gpointer backend_data)
mdb_env_close(bd->env);
}

g_slice_free(JLMDBData, bd);
g_free(bd);
}

static JBackend lmdb_backend = {
Expand Down
8 changes: 4 additions & 4 deletions backend/kv/mongodb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ backend_batch_start(gpointer backend_data, gchar const* namespace, JSemantics* s
bson_destroy(command);
bson_destroy(reply);

batch = g_slice_new(JMongoDBBatch);
batch = g_new(JMongoDBBatch, 1);
batch->bulk_op = bulk_op;
batch->namespace = g_strdup(namespace);
batch->is_empty = TRUE;
Expand Down Expand Up @@ -163,7 +163,7 @@ backend_batch_execute(gpointer backend_data, gpointer backend_batch)

mongoc_bulk_operation_destroy(batch->bulk_op);
g_free(batch->namespace);
g_slice_free(JMongoDBBatch, batch);
g_free(batch);

return ret;
}
Expand Down Expand Up @@ -427,7 +427,7 @@ backend_init(gchar const* path, gpointer* backend_data)

split = g_strsplit(path, ":", 0);

bd = g_slice_new(JMongoDBData);
bd = g_new(JMongoDBData, 1);
bd->host = g_strdup(split[0]);
bd->database = g_strdup(split[1]);

Expand Down Expand Up @@ -471,7 +471,7 @@ backend_fini(gpointer backend_data)
g_free(bd->database);
g_free(bd->host);

g_slice_free(JMongoDBData, bd);
g_free(bd);

mongoc_cleanup();
}
Expand Down
14 changes: 7 additions & 7 deletions backend/kv/rocksdb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ backend_batch_start(gpointer backend_data, gchar const* namespace, JSemantics* s
g_return_val_if_fail(namespace != NULL, FALSE);
g_return_val_if_fail(backend_batch != NULL, FALSE);

batch = g_slice_new(JRocksDBBatch);
batch = g_new(JRocksDBBatch, 1);

batch->batch = rocksdb_writebatch_create();
batch->namespace = g_strdup(namespace);
Expand Down Expand Up @@ -98,7 +98,7 @@ backend_batch_execute(gpointer backend_data, gpointer backend_batch)
j_semantics_unref(batch->semantics);
g_free(batch->namespace);
rocksdb_writebatch_destroy(batch->batch);
g_slice_free(JRocksDBBatch, batch);
g_free(batch);

return (rocksdb_error == NULL);
}
Expand Down Expand Up @@ -182,7 +182,7 @@ backend_get_all(gpointer backend_data, gchar const* namespace, gpointer* backend

if (it != NULL)
{
iterator = g_slice_new(JRocksDBIterator);
iterator = g_new(JRocksDBIterator, 1);
iterator->iterator = it;
iterator->first = TRUE;
iterator->prefix = g_strdup_printf("%s:", namespace);
Expand All @@ -209,7 +209,7 @@ backend_get_by_prefix(gpointer backend_data, gchar const* namespace, gchar const

if (it != NULL)
{
iterator = g_slice_new(JRocksDBIterator);
iterator = g_new(JRocksDBIterator, 1);
iterator->iterator = it;
iterator->first = TRUE;
iterator->prefix = g_strdup_printf("%s:%s", namespace, prefix);
Expand Down Expand Up @@ -265,7 +265,7 @@ backend_iterate(gpointer backend_data, gpointer backend_iterator, gchar const**
out:
g_free(iterator->prefix);
rocksdb_iter_destroy(iterator->iterator);
g_slice_free(JRocksDBIterator, iterator);
g_free(iterator);

return FALSE;
}
Expand All @@ -283,7 +283,7 @@ backend_init(gchar const* path, gpointer* backend_data)
dirname = g_path_get_dirname(path);
g_mkdir_with_parents(dirname, 0700);

bd = g_slice_new(JRocksDBData);
bd = g_new(JRocksDBData, 1);
bd->read_options = rocksdb_readoptions_create();
bd->write_options = rocksdb_writeoptions_create();
bd->write_options_sync = rocksdb_writeoptions_create();
Expand Down Expand Up @@ -326,7 +326,7 @@ backend_fini(gpointer backend_data)
rocksdb_close(bd->db);
}

g_slice_free(JRocksDBData, bd);
g_free(bd);
}

static JBackend rocksdb_backend = {
Expand Down
10 changes: 5 additions & 5 deletions backend/kv/sqlite.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ backend_batch_start(gpointer backend_data, gchar const* namespace, JSemantics* s

if (sqlite3_exec(bd->db, "BEGIN TRANSACTION;", NULL, NULL, NULL) == SQLITE_OK)
{
batch = g_slice_new(JSQLiteBatch);
batch = g_new(JSQLiteBatch, 1);

batch->namespace = g_strdup(namespace);
batch->semantics = j_semantics_ref(semantics);
Expand Down Expand Up @@ -81,7 +81,7 @@ backend_batch_execute(gpointer backend_data, gpointer backend_batch)

j_semantics_unref(batch->semantics);
g_free(batch->namespace);
g_slice_free(JSQLiteBatch, batch);
g_free(batch);

return ret;
}
Expand Down Expand Up @@ -246,7 +246,7 @@ backend_init(gchar const* path, gpointer* backend_data)
dirname = g_path_get_dirname(path);
g_mkdir_with_parents(dirname, 0700);

bd = g_slice_new(JSQLiteData);
bd = g_new(JSQLiteData, 1);

if (sqlite3_open(path, &(bd->db)) != SQLITE_OK)
{
Expand All @@ -269,7 +269,7 @@ backend_init(gchar const* path, gpointer* backend_data)

error:
sqlite3_close(bd->db);
g_slice_free(JSQLiteData, bd);
g_free(bd);

return FALSE;
}
Expand All @@ -284,7 +284,7 @@ backend_fini(gpointer backend_data)
sqlite3_close(bd->db);
}

g_slice_free(JSQLiteData, bd);
g_free(bd);
}

static JBackend sqlite_backend = {
Expand Down
18 changes: 9 additions & 9 deletions backend/object/gio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ backend_create(gpointer backend_data, gchar const* namespace, gchar const* path,

j_trace_file_end(full_path, J_TRACE_FILE_CREATE, 0, 0);

bo = g_slice_new(JBackendObject);
bo = g_new(JBackendObject, 1);
bo->path = full_path;
bo->stream = stream;

Expand All @@ -99,7 +99,7 @@ backend_open(gpointer backend_data, gchar const* namespace, gchar const* path, g
stream = g_file_open_readwrite(file, NULL, NULL);
j_trace_file_end(full_path, J_TRACE_FILE_OPEN, 0, 0);

bo = g_slice_new(JBackendObject);
bo = g_new(JBackendObject, 1);
bo->path = full_path;
bo->stream = stream;

Expand Down Expand Up @@ -129,7 +129,7 @@ backend_delete(gpointer backend_data, gpointer backend_object)

g_object_unref(bo->stream);
g_free(bo->path);
g_slice_free(JBackendObject, bo);
g_free(bo);

return ret;
}
Expand All @@ -148,7 +148,7 @@ backend_close(gpointer backend_data, gpointer backend_object)

g_object_unref(bo->stream);
g_free(bo->path);
g_slice_free(JBackendObject, bo);
g_free(bo);

return ret;
}
Expand Down Expand Up @@ -300,7 +300,7 @@ backend_get_all(gpointer backend_data, gchar const* namespace, gpointer* backend

if (it != NULL)
{
iterator = g_slice_new(JBackendIterator);
iterator = g_new(JBackendIterator, 1);
iterator->iterator = it;
iterator->prefix = NULL;
iterator->namespace_len = strlen(full_path) + 1;
Expand Down Expand Up @@ -330,7 +330,7 @@ backend_get_by_prefix(gpointer backend_data, gchar const* namespace, gchar const

if (it != NULL)
{
iterator = g_slice_new(JBackendIterator);
iterator = g_new(JBackendIterator, 1);
iterator->iterator = it;
iterator->prefix = g_strdup(prefix);
iterator->namespace_len = strlen(full_path) + 1;
Expand Down Expand Up @@ -375,7 +375,7 @@ backend_iterate(gpointer backend_data, gpointer backend_iterator, gchar const**

g_free(iterator->prefix);
g_object_unref(iterator->iterator);
g_slice_free(JBackendIterator, iterator);
g_free(iterator);

return FALSE;
}
Expand All @@ -386,7 +386,7 @@ backend_init(gchar const* path, gpointer* backend_data)
JBackendData* bd;
GFile* file;

bd = g_slice_new(JBackendData);
bd = g_new(JBackendData, 1);
bd->path = g_strdup(path);

file = g_file_new_for_path(path);
Expand All @@ -404,7 +404,7 @@ backend_fini(gpointer backend_data)
JBackendData* bd = backend_data;

g_free(bd->path);
g_slice_free(JBackendData, bd);
g_free(bd);
}

static JBackend gio_backend = {
Expand Down
Loading

0 comments on commit 38b71cd

Please sign in to comment.