This file is part of GNUnet.
Copyright (C) 2011, 2012 GNUnet e.V.
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
+
/**
* @file regex/gnunet-regex-simulation-profiler.c
* @brief Regex profiler that dumps all DFAs into a database instead of
* using the DHT (with cadet).
* @author Maximilian Szengel
+ * @author Christophe Genevey
*
*/
#include "gnunet_util_lib.h"
#include "regex_internal_lib.h"
#include "gnunet_mysql_lib.h"
+#include "gnunet_my_lib.h"
#include <mysql/mysql.h>
/**
GNUNET_SCHEDULER_shutdown ();
}
-
-/**
- * Dummy function for prepared select. Always returns #GNUNET_OK.
- *
- * @param cls closure
- * @param num_values number of values.
- * @param values returned values from select stmt.
- *
- * @return #GNUNET_OK
- */
-static int
-return_ok (void *cls,
- unsigned int num_values,
- MYSQL_BIND * values)
-{
- return GNUNET_OK;
-}
-
-
/**
* Iterator over all states that inserts each state into the MySQL db.
*
{
unsigned int i;
int result;
- unsigned long k_length;
- unsigned long e_length;
- unsigned long d_length;
- MYSQL_BIND rbind[1];
- unsigned long long total;
+
+ uint32_t iaccepting = (uint32_t)accepting;
+ uint64_t total;
GNUNET_assert (NULL != mysql_ctx);
for (i = 0; i < num_edges; i++)
{
- k_length = sizeof (struct GNUNET_HashCode);
- e_length = strlen (edges[i].label);
- d_length = sizeof (struct GNUNET_HashCode);
- memset (rbind, 0, sizeof (rbind));
- total = -1;
- rbind[0].buffer_type = MYSQL_TYPE_LONGLONG;
- rbind[0].buffer = &total;
- rbind[0].is_unsigned = GNUNET_YES;
-
- result =
- GNUNET_MYSQL_statement_run_prepared_select (select_stmt_handle, 1,
- rbind, &return_ok, NULL,
- MYSQL_TYPE_BLOB, key,
- sizeof (struct
- GNUNET_HashCode),
- &k_length,
- MYSQL_TYPE_STRING,
- edges[i].label,
- strlen (edges[i].label),
- &e_length, -1);
+ struct GNUNET_MY_QueryParam params_select[] = {
+ GNUNET_MY_query_param_auto_from_type (key),
+ GNUNET_MY_query_param_string (edges[i].label),
+ GNUNET_MY_query_param_end
+ };
+
+ struct GNUNET_MY_ResultSpec results_select[] = {
+ GNUNET_MY_result_spec_uint64 (&total),
+ GNUNET_MY_result_spec_end
+ };
+
+ result =
+ GNUNET_MY_exec_prepared (mysql_ctx,
+ select_stmt_handle,
+ params_select);
if (GNUNET_SYSERR == result)
{
return;
}
+ result =
+ GNUNET_MY_extract_result (select_stmt_handle,
+ results_select);
+
+ if (GNUNET_SYSERR == result)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Error extracting result mysql select statement\n");
+ GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+ return;
+ }
+
if (-1 != total && total > 0)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Total: %llu (%s, %s)\n", total,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Total: %llu (%s, %s)\n",
+ (unsigned long long)total,
GNUNET_h2s (key), edges[i].label);
}
- result =
- GNUNET_MYSQL_statement_run_prepared (stmt_handle, NULL,
- MYSQL_TYPE_BLOB, key,
- sizeof (struct GNUNET_HashCode),
- &k_length, MYSQL_TYPE_STRING,
- edges[i].label,
- strlen (edges[i].label), &e_length,
- MYSQL_TYPE_BLOB,
- &edges[i].destination,
- sizeof (struct GNUNET_HashCode),
- &d_length, MYSQL_TYPE_LONG,
- &accepting, GNUNET_YES, -1);
+ struct GNUNET_MY_QueryParam params_stmt[] = {
+ GNUNET_MY_query_param_auto_from_type (&key),
+ GNUNET_MY_query_param_string (edges[i].label),
+ GNUNET_MY_query_param_auto_from_type (&edges[i].destination),
+ GNUNET_MY_query_param_uint32 (&iaccepting),
+ GNUNET_MY_query_param_end
+ };
+
+ result =
+ GNUNET_MY_exec_prepared (mysql_ctx,
+ stmt_handle,
+ params_stmt);
if (0 == result)
{
char *key_str = GNUNET_strdup (GNUNET_h2s (key));
char *to_key_str = GNUNET_strdup (GNUNET_h2s (&edges[i].destination));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Merged (%s, %s, %s, %i)\n", key_str,
- edges[i].label, to_key_str, accepting);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Merged (%s, %s, %s, %i)\n",
+ key_str,
+ edges[i].label,
+ to_key_str,
+ accepting);
+
GNUNET_free (key_str);
GNUNET_free (to_key_str);
num_merged_transitions++;
if (0 == num_edges)
{
- k_length = sizeof (struct GNUNET_HashCode);
- e_length = 0;
- d_length = 0;
-
- result =
- GNUNET_MYSQL_statement_run_prepared (stmt_handle, NULL,
- MYSQL_TYPE_BLOB, key,
- sizeof (struct GNUNET_HashCode),
- &k_length, MYSQL_TYPE_STRING, NULL,
- 0, &e_length, MYSQL_TYPE_BLOB,
- NULL, 0, &d_length,
- MYSQL_TYPE_LONG, &accepting,
- GNUNET_YES, -1);
+ struct GNUNET_MY_QueryParam params_stmt[] = {
+ GNUNET_MY_query_param_auto_from_type (key),
+ GNUNET_MY_query_param_string (""),
+ GNUNET_MY_query_param_fixed_size (NULL, 0),
+ GNUNET_MY_query_param_uint32 (&iaccepting),
+ GNUNET_MY_query_param_end
+ };
+
+ result =
+ GNUNET_MY_exec_prepared (mysql_ctx,
+ stmt_handle,
+ params_stmt);
if (1 != result && 0 != result)
{
int
main (int argc, char *const *argv)
{
- static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'t', "table", "TABLENAME",
- gettext_noop ("name of the table to write DFAs"),
- 1, &GNUNET_GETOPT_set_string, &table_name},
- {'p', "max-path-compression", "MAX_PATH_COMPRESSION",
- gettext_noop ("maximum path compression length"),
- 1, &GNUNET_GETOPT_set_uint, &max_path_compression},
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+
+ GNUNET_GETOPT_option_string ('t',
+ "table",
+ "TABLENAME",
+ gettext_noop ("name of the table to write DFAs"),
+ &table_name),
+
+ GNUNET_GETOPT_option_uint ('p',
+ "max-path-compression",
+ "MAX_PATH_COMPRESSION",
+ gettext_noop ("maximum path compression length"),
+ &max_path_compression),
+
GNUNET_GETOPT_OPTION_END
};
int ret;
projects / oweals / gnunet.git / blobdiff