Date: Fri Feb 21 20:33:12 CET 2003
User: Derick Rethans
Directory: srm/test/storage
Log Message:
[0.50]
- Deleted all reference to stores, which will be reimplemented in a much
cleaner way later.
Deleted files:
srm/main/src/srm_storage.c (last version: 1.35)
srm/main/src/srm_storage.h (last version: 1.17)
srm/main/src/storage.c (last version: 1.21)
Modified files:
srm/main/main.c (version: 1.74)
srm/main/src/Makefile.am (version: 1.37)
srm/main/src/srm_protocol_standard.c (version: 1.71)
srm/main/src/srm_protocol_standard.h (version: 1.28)
srm/modules/standard/srm_standard.h (version: 1.16)
srm/modules/standard/standard.c (version: 1.37)
srm/test/srmclient/main.c (version: 1.45)
srm/test/storage/main.c (version: 1.12)
[FILE: /srm/main/main.c]
--- srm/main/main.c:1.73 Thu Feb 20 19:33:26 2003 GMT
+++ srm/main/main.c Fri Feb 21 18:33:09 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.73 2003/02/20 20:33:26 derick Exp $ */
+/* $Id: cvstemp,v 1.74 2003/02/21 19:33:09 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -38,7 +38,6 @@
#include "srm_modules.h"
#include "srm_protocols.h"
#include "srm_protocol_standard.h"
-#include "srm_storage.h"
BEGIN_INI_ENTRIES
@@ -139,11 +138,6 @@
INI_SETTING (loglevel) = INI_SETTING_UC32 ("srm", "log_level", 30);
INI_SETTING (port) = INI_SETTING_UC32 ("srm", "port", 7700);
INI_SETTING (no_tcp_ip) = INI_SETTING_UC8 ("srm", "no_tcp_ip", 1);
- INI_SETTING (application_store_items) = INI_SETTING_UC32 ("store", "application_items", 2048);
- INI_SETTING (session_store_items) = INI_SETTING_UC32 ("store", "session_items", 4096);
- INI_SETTING (application_lock_store_items) = INI_SETTING_UC32 ("store", "application_lock_items", 1024);
- INI_SETTING (session_lock_store_items) = INI_SETTING_UC32 ("store", "session_lock_items", 1024);
- INI_SETTING (save_path) = INI_SETTING_STR ("store", "session_save_path", "/var/state");
}
void *sig_handler (void *arg)
@@ -192,7 +186,6 @@
struct timeval timeout;
struct in_addr *iaddr;
- STORE_SETTINGS_DEF;
FETCH_INI_SETTINGS;
LOAD_INI_SETTING_CALLERS
@@ -244,12 +237,6 @@
/* Initialising hashes and variabeles */
srm_modulelist_init ();
srm_functionlist_init ();
- STORE_SETTING(global_hash_size) = INI_SETTING (application_store_items);
- STORE_SETTING(session_hash_size) = INI_SETTING (session_store_items);
- STORE_SETTING(global_lock_hash_size) = INI_SETTING (application_lock_store_items);
- STORE_SETTING(session_lock_hash_size) = INI_SETTING (session_lock_store_items);
- STORE_SETTING(save_path) = INI_SETTING (save_path);
- srm_store_init (STORE_SETTINGS);
/* Starting modules */
srm_load_modules ();
@@ -372,7 +359,6 @@
srm_deinit_protocol_registry();
srm_unload_modules ();
- srm_store_close (STORE_SETTINGS);
/* unload_ini_settings (); */
srm_stop_logging ();
[FILE: /srm/main/src/Makefile.am]
--- srm/main/src/Makefile.am:1.36 Thu Feb 20 19:33:27 2003 GMT
+++ srm/main/src/Makefile.am Fri Feb 21 18:33:10 2003 GMT
@@ -1,5 +1,5 @@
##
-## $Id: cvstemp,v 1.36 2003/02/20 20:33:27 derick Exp $
+## $Id: cvstemp,v 1.37 2003/02/21 19:33:10 derick Exp $
##
## The contents of this file are subject to the Vulcan Logic Public
@@ -25,11 +25,11 @@
lib_LTLIBRARIES = libsrm_client.la
noinst_LIBRARIES = libsrm.a
-libsrm_client_la_SOURCES = srm_client.c storage.c srm_error.c srm_hash.c srm_llist.c srm_value.c srm_compat.c srm_storage.c srm_queue.c
+libsrm_client_la_SOURCES = srm_client.c srm_error.c srm_hash.c srm_llist.c srm_value.c srm_compat.c srm_queue.c
-libsrm_a_SOURCES = srm_protocol_standard.c srm_error.c srm_modules.c functions.c srm_hash.c srm_llist.c srm_value.c srm_compat.c srm_protocols.c srm_storage.c srm_ini_parser.y srm_ini_scanner.l
+libsrm_a_SOURCES = srm_protocol_standard.c srm_error.c srm_modules.c functions.c srm_hash.c srm_llist.c srm_value.c srm_compat.c srm_protocols.c srm_ini_parser.y srm_ini_scanner.l
-noinst_HEADERS = srm_protocol_standard.h srm_error.h ini_parser.h srm_modules.h srm_storage.h
+noinst_HEADERS = srm_protocol_standard.h srm_error.h ini_parser.h srm_modules.h
include_HEADERS = functions.h srm_hash.h srm_client.h srm_modules.h srm_value.h srm_compat.h srm_llist.h srm_queue.h
libsrm_client_la_LDFLAGS = -version-info @SRM_VERSION_INFO@
[FILE: /srm/main/src/srm_protocol_standard.c]
--- srm/main/src/srm_protocol_standard.c:1.70 Wed Feb 19 19:15:54 2003 GMT
+++ srm/main/src/srm_protocol_standard.c Fri Feb 21 18:33:10 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.70 2003/02/19 20:15:54 derick Exp $ */
+/* $Id: cvstemp,v 1.71 2003/02/21 19:33:10 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -29,7 +29,6 @@
#include "srm_config.h"
#include "srm_protocol_standard.h"
#include "srm_protocols.h"
-#include "srm_storage.h"
/* Function prototypes (local) */
static void dump_packet (srm_ui8* packet, srm_ui8 size);
@@ -179,190 +178,6 @@
free(ret_data);
} /* 1}}} */
-static void srm_process_store_data (int fd, srm_ui8* packet, srm_ui8 size, srm_ui8* pdata, srm_ui8 dsize) /* {{{1 */
-{
- srm_llist_element *e;
- struct srm_value* command;
- struct srm_value* ret_val;
- struct srm_value *store, *key, *data;
- srm_ui8* ret_data;
- srm_ui32 length;
- srm_ui8* session;
- int ret;
-
- ret_val = srm_value_init();
- /* Getting data from packet */
-#ifdef SRM_DEBUG
- dump_packet((srm_ui8*) pdata, dsize);
-#endif
- deserialize(pdata, dsize, (struct srm_value**) &command, 0);
- srm_fmt_message(LL_DATA, "Notice", "Store data");
- e = SRM_LLIST_HEAD(command->list);
- store = (struct srm_value *) SRM_LLIST_VALP(e);
- e = SRM_LLIST_NEXT(e);
- key = (struct srm_value *) SRM_LLIST_VALP(e);
- e = SRM_LLIST_NEXT(e);
- data = (struct srm_value *) SRM_LLIST_VALP(e);
- srm_fmt_message(LL_DATA, "Store", "Store = %d", store->u8_value);
-#ifdef SRM_DEBUG
- srm_value_dump(data, 0);
-#endif
-
- switch (store->u8_value) {
- case SRM_ST_APPLICATION:
- ret = srm_global_data_store(key->s_value, key->value_length, data);
- break;
- case SRM_ST_SESSION:
- session = malloc(sizeof(sess_key_t) + key->value_length);
- memcpy(session, &packet[16], sizeof (sess_key_t));
- memcpy(&session[sizeof (sess_key_t)], key->s_value, key->value_length);
- ret = srm_session_data_store(session, sizeof(sess_key_t) + key->value_length, data);
- free(session);
- break;
- default:
- ret = ERROR_UNKNOWN_STORE;
- }
-
- switch (ret) {
- case SRM_SUCCESS:
- VALP_SET_BOOL(ret_val);
- SRMVALP_BOOL(ret_val) = SRM_SUCCESS;
- break;
- case ERROR_KEY_EXISTS:
- SRMVALP_SET_STR(ret_val, strdup(ERRMSG_KEY_EXISTS));
- VALP_SET_ERROR(ret_val);
- break;
- default:
- SRMVALP_SET_STR(ret_val, strdup(ERRMSG_UNKNOWN));
- VALP_SET_ERROR(ret_val);
- break;
- }
-
-/* Sending the result */
- serialize(ret_val, (srm_ui8**) &ret_data, &length);
- server_send_packet(fd, PKT_DATA, ret_data, length, packet);
-
- free(ret_val);
- free(ret_data);
-} /* 1}}} */
-
-static void srm_process_retrieve_data (int fd, srm_ui8* packet, srm_ui8 size, srm_ui8* pdata, srm_ui8 dsize) /* {{{1 */
-{
- struct srm_value* command;
- struct srm_value* ret_val;
- struct srm_value *store, *key;
- srm_ui8* ret_data;
- srm_ui32 length;
- srm_ui8* session;
-
- ret_val = srm_value_init();
- /* Getting data from packet */
-#ifdef SRM_DEBUG
- dump_packet((srm_ui8*) pdata, dsize);
-#endif
- deserialize(pdata, dsize, (struct srm_value**) &command, 0);
- srm_fmt_message(LL_DATA, "Notice", "Retrieve data");
- store = (struct srm_value *) SRM_LLIST_VALP(SRM_LLIST_HEAD (command->list));
- key = (struct srm_value *) SRM_LLIST_VALP(SRM_LLIST_NEXT (SRM_LLIST_HEAD (command->list)));
- srm_fmt_message(LL_DATA, "Retrieve", "Store = %d", store->u8_value);
-
- switch (store->u8_value) {
- case SRM_ST_APPLICATION:
- if ((ret_val = srm_global_data_retrieve(key->s_value, key->value_length)) == NULL) {
- ret_val = srm_value_init();
- VALP_SET_NULL(ret_val);
- }
- break;
- case SRM_ST_SESSION:
- session = malloc(sizeof(sess_key_t) + key->value_length);
- memcpy(session, &packet[16], sizeof (sess_key_t));
- memcpy(&session[sizeof (sess_key_t)], key->s_value, key->value_length);
-
- if ((ret_val = srm_session_data_retrieve(session, sizeof(sess_key_t) + key->value_length)) == NULL) {
- ret_val = srm_value_init();
- VALP_SET_NULL(ret_val);
- }
-
- free(session);
- break;
- }
-
-/* Sending the result */
-#ifdef SRM_DEBUG
- srm_value_dump(ret_val, 0);
-#endif
- serialize(ret_val, (srm_ui8**) &ret_data, &length);
- server_send_packet(fd, PKT_DATA, ret_data, length, packet);
-
- if (SRM_IS_ERROR(ret_val)) {
- free (ret_val);
- }
- free (ret_data);
-} /* 1}}} */
-
-
-static void srm_process_delete_data (int fd, srm_ui8* packet, srm_ui8 size, srm_ui8* pdata, srm_ui8 dsize) /* {{{1 */
-{
- struct srm_value* command;
- struct srm_value* ret_val;
- struct srm_value *store, *key;
- srm_ui8* ret_data;
- srm_ui32 length;
- srm_ui8* session;
- int ret;
-
- ret_val = srm_value_init();
- /* Getting data from packet */
-#ifdef SRM_DEBUG
- dump_packet((srm_ui8*) pdata, dsize);
-#endif
- deserialize(pdata, dsize, (struct srm_value**) &command, 0);
- srm_fmt_message(LL_DATA, "Notice", "Delete data");
- store = (struct srm_value *) SRM_LLIST_VALP(SRM_LLIST_HEAD (command->list));
- key = (struct srm_value *) SRM_LLIST_VALP(SRM_LLIST_NEXT (SRM_LLIST_HEAD (command->list)));
-#ifdef SRM_DEBUG
- srm_fmt_message(LL_DATA, "Delete", "Store = %d", store->u8_value);
-#endif
-
- switch (store->u8_value) {
- case SRM_ST_APPLICATION:
- ret = srm_global_data_delete(key->s_value, key->value_length);
- break;
- case SRM_ST_SESSION:
- session = malloc(sizeof(sess_key_t) + key->value_length);
- memcpy(session, &packet[16], sizeof (sess_key_t));
- memcpy(&session[sizeof (sess_key_t)], key->s_value, key->value_length);
-
- ret = srm_session_data_delete(session, sizeof(sess_key_t) + key->value_length);
-
- free(session);
- break;
- default:
- ret = ERROR_UNKNOWN_STORE;
- }
-
- switch (ret) {
- case SRM_SUCCESS:
- VALP_SET_BOOL(ret_val);
- SRMVALP_BOOL(ret_val) = SRM_SUCCESS;
- break;
- case ERROR_KEY_EXISTS:
- SRMVALP_SET_STR(ret_val, strdup(ERRMSG_KEY_EXISTS));
- VALP_SET_ERROR(ret_val);
- break;
- default:
- SRMVALP_SET_STR(ret_val, strdup(ERRMSG_UNKNOWN));
- VALP_SET_ERROR(ret_val);
- break;
- }
-
-/* Sending the result */
- serialize(ret_val, (srm_ui8**) &ret_data, &length);
- server_send_packet(fd, PKT_DATA, ret_data, length, packet);
-
- free(ret_val);
- free(ret_data);
-} /* 1}}} */
static void connection_abort (int fd) /* {{{1 */
{
@@ -418,7 +233,7 @@
connection_abort_with_error(fd, "Packet is invalid");
}
}
- if (/*srm_pkt_validate (fd, header, length)*/TRUE) {
+ if (TRUE) {
switch (header.type) {
case PKT_HANDSHAKE1:
srm_do_handshake(fd, (srm_ui8*) &header);
@@ -428,15 +243,6 @@
break;
case PKT_DISCONNECT:
connection_close(fd);
- break;
- case PKT_STORE_DATA:
- srm_process_store_data(fd, (srm_ui8*) &header, length, (srm_ui8*) data, header.data_length);
- break;
- case PKT_RETRIEVE_DATA:
- srm_process_retrieve_data(fd, (srm_ui8*) &header, length, (srm_ui8*) data, header.data_length);
- break;
- case PKT_DELETE_DATA:
- srm_process_delete_data(fd, (srm_ui8*) &header, length, (srm_ui8*) data, header.data_length);
break;
default:
connection_abort_with_error(fd, "Unknown packet type");
[FILE: /srm/main/src/srm_protocol_standard.h]
--- srm/main/src/srm_protocol_standard.h:1.27 Wed Feb 19 19:40:27 2003 GMT
+++ srm/main/src/srm_protocol_standard.h Fri Feb 21 18:33:10 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.27 2003/02/19 20:40:27 derick Exp $ */
+/* $Id: cvstemp,v 1.28 2003/02/21 19:33:10 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -34,20 +34,11 @@
#define PKT_COMMAND 11
#define PKT_DATA 12
-#define PKT_STORE_DATA 21
-#define PKT_RETRIEVE_DATA 22
-#define PKT_DELETE_DATA 23
-
/* Protocol Types */
#define PROTOCOL_NATIVE 1
-#define PROTOCOL_XML 2
/* Encryption Types */
#define ENCRYPTION_NONE 1
-
-/* Checksum Actions */
-#define CHKSUM_CHECK TRUE
-#define CHKSUM_SET FALSE
/* Packet header */
typedef struct pkt_header {
[FILE: /srm/modules/standard/srm_standard.h]
--- srm/modules/standard/srm_standard.h:1.15 Thu Feb 20 19:33:33 2003 GMT
+++ srm/modules/standard/srm_standard.h Fri Feb 21 18:33:11 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.15 2003/02/20 20:33:33 derick Exp $ */
+/* $Id: cvstemp,v 1.16 2003/02/21 19:33:11 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -24,7 +24,6 @@
#define __SRM_STANDARD_H__
#include "functions.h"
-#include "srm_storage.h"
/* {{{ Module pointer */
extern s_module_entry standard_module_entry;
[FILE: /srm/modules/standard/standard.c]
--- srm/modules/standard/standard.c:1.36 Thu Feb 20 19:33:33 2003 GMT
+++ srm/modules/standard/standard.c Fri Feb 21 18:33:11 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.36 2003/02/20 20:33:33 derick Exp $ */
+/* $Id: cvstemp,v 1.37 2003/02/21 19:33:11 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -264,7 +264,7 @@
/* Initializing return list */
list = srm_llist_alloc (SRM_LLIST_VALUE_FREE);
- srm_hash_apply (AST, (void *) list, srm_add_key_to_list);
+/* srm_hash_apply (AST, (void *) list, srm_add_key_to_list); */
SRM_RETVAL_LIST(list);
}
/* }}} */
@@ -277,7 +277,7 @@
/* Initializing return list */
list = srm_llist_alloc (SRM_LLIST_VALUE_FREE);
- srm_hash_apply (SST, (void *) list, srm_add_key_to_list);
+/* srm_hash_apply (SST, (void *) list, srm_add_key_to_list); */
SRM_RETVAL_LIST(list);
}
/* }}} */
@@ -287,8 +287,10 @@
SRM_FUNCTION(lock)
{
srm_value *arg1;
+/*
void *dummy;
srm_value *key = NULL;
+*/
#ifdef SRM_DEBUG
srm_value_dump (input, 0);
@@ -296,7 +298,7 @@
SRM_ARGC_CHECK (1);
SRM_GET_ARG (0, (arg1), STR);
-
+/*
if (srm_hash_find (ALH, SRMVALP_STR(arg1), arg1->value_length, &dummy) == SRM_FAILED) {
SRMVALP_SET_BINSTR (key, session_key, sizeof (sess_key_t), 1);
if (srm_hash_add (ALH, SRMVALP_STR(arg1), arg1->value_length, NULL) == SRM_SUCCESS) {
@@ -307,6 +309,7 @@
if (key) {
srm_value_free (key);
}
+*/
SRM_RETVAL_BOOL (FALSE)
return;
}
@@ -317,7 +320,9 @@
SRM_FUNCTION(unlock)
{
srm_value *arg1;
+/*
srm_value *key = NULL;
+*/
#ifdef SRM_DEBUG
srm_value_dump (input, 0);
@@ -325,25 +330,21 @@
SRM_ARGC_CHECK (1);
SRM_GET_ARG (0, (arg1), STR);
-
-printf ("%s:%d\n", __FILE__, __LINE__);
+/*
if (srm_hash_find (ALH, SRMVALP_STR(arg1), arg1->value_length, (void *) &key) == SRM_SUCCESS) {
-printf ("%s:%d\n", __FILE__, __LINE__);
if (memcmp (session_key, SRMVALP_STR(arg1), sizeof (sess_key_t)) == 0) {
-printf ("%s:%d\n", __FILE__, __LINE__);
if (srm_hash_delete (ALH, SRMVALP_STR(arg1), arg1->value_length) == SRM_SUCCESS) {
-printf ("%s:%d\n", __FILE__, __LINE__);
SRM_RETVAL_BOOL(TRUE)
} else {
-printf ("%s:%d\n", __FILE__, __LINE__);
SRM_RETVAL_BOOL(FALSE)
}
} else {
-printf ("%s:%d\n", __FILE__, __LINE__);
SRM_RETVAL_BOOL(FALSE)
}
}
-printf ("%s:%d\n", __FILE__, __LINE__);
+*/
+ SRM_RETVAL_BOOL (FALSE)
+ return;
}
/* }}} */
[FILE: /srm/test/srmclient/main.c]
--- srm/test/srmclient/main.c:1.44 Thu Feb 20 19:33:37 2003 GMT
+++ srm/test/srmclient/main.c Fri Feb 21 18:33:12 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.44 2003/02/20 20:33:37 derick Exp $ */
+/* $Id: cvstemp,v 1.45 2003/02/21 19:33:12 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -31,7 +31,6 @@
struct srm_host_t host;
connect_data_t connect_data;
struct srm_value* ret_val;
- struct srm_value* ret_val2;
SRM_LIST (params);
memset (&connect_data, 0, sizeof(connect_data_t));
@@ -100,10 +99,6 @@
SRM_LIST_ADD (STR, params, "dbquery");
ret_val = srm_do_command (connect_data, "srm_module_info", params);
srm_value_dump (ret_val, 0);
- /* store data test */
- ret_val2 = srm_data_store (SRM_ST_SESSION, connect_data, "test", strlen("test"), ret_val);
- srm_value_dump (ret_val2, 0);
- srm_value_free (ret_val2);
srm_value_free (ret_val);
SRM_LIST_FREE (params);
[FILE: /srm/test/storage/main.c]
--- srm/test/storage/main.c:1.11 Thu Feb 20 19:33:38 2003 GMT
+++ srm/test/storage/main.c Fri Feb 21 18:33:12 2003 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.11 2003/02/20 20:33:38 derick Exp $ */
+/* $Id: cvstemp,v 1.12 2003/02/21 19:33:12 derick Exp $ */
/* The contents of this file are subject to the Vulcan Logic Public
* License Version 1.1 (the "License"); you may not use this file
@@ -30,7 +30,9 @@
struct srm_host_t host;
connect_data_t connect_data;
struct srm_value* ret_val;
+/*
struct srm_value* data;
+*/
if (argc < 3 || argc > 4) {
srm_fmt_message (LL_USAGE, "Usage", "storage [operation] [key] [string]");
@@ -56,7 +58,7 @@
srm_value_free (ret_val);
}
}
-
+/*
switch (argv[1][0]) {
case 's':
SRMVALP_SET_STR (data, strdup(argv[3]));
@@ -72,7 +74,7 @@
}
srm_value_dump (ret_val, 0);
srm_value_free (ret_val);
-
+*/
srm_disconnect(connect_data);
return 0;
}
Received on Fri Feb 21 20:33:14 2003
This archive was generated by hypermail 2.1.8 : Tue Jan 06 2009 - 07:00:04 CET