|
 |
ac32bf |
From 4474f696c9207ceb21d55a0047ab6871879afe5a Mon Sep 17 00:00:00 2001
|
|
|
ac32bf |
From: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
|
ac32bf |
Date: Fri, 31 May 2013 13:51:55 -0300
|
|
|
ac32bf |
Subject: [PATCH 04/32] ras-record: reorder functions
|
|
|
ac32bf |
|
|
|
ac32bf |
No functional changes
|
|
|
ac32bf |
|
|
|
ac32bf |
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
|
ac32bf |
---
|
|
|
ac32bf |
ras-record.c | 77 +++++++++++++++++++++++++++++----------------------------
|
|
|
ac32bf |
1 files changed, 39 insertions(+), 38 deletions(-)
|
|
|
ac32bf |
|
|
|
ac32bf |
diff --git a/ras-record.c b/ras-record.c
|
|
|
ac32bf |
index efcd78f..298977e 100644
|
|
|
ac32bf |
--- a/ras-record.c
|
|
|
ac32bf |
+++ b/ras-record.c
|
|
|
ac32bf |
@@ -46,6 +46,10 @@ struct db_table_descriptor {
|
|
|
ac32bf |
size_t num_fields;
|
|
|
ac32bf |
};
|
|
|
ac32bf |
|
|
|
ac32bf |
+/*
|
|
|
ac32bf |
+ * Table and functions to handle ras:mc_event
|
|
|
ac32bf |
+ */
|
|
|
ac32bf |
+
|
|
|
ac32bf |
static const struct db_fields mc_event_fields[] = {
|
|
|
ac32bf |
{ .name="id", .type="INTEGER PRIMARY KEY" },
|
|
|
ac32bf |
{ .name="timestamp", .type="TEXT" },
|
|
|
ac32bf |
@@ -69,8 +73,41 @@ static const struct db_table_descriptor mc_event_tab = {
|
|
|
ac32bf |
.num_fields = ARRAY_SIZE(mc_event_fields),
|
|
|
ac32bf |
};
|
|
|
ac32bf |
|
|
|
ac32bf |
-const char *insertdb = "INSERT INTO";
|
|
|
ac32bf |
-const char *valuesdb = " VALUES ";
|
|
|
ac32bf |
+int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev)
|
|
|
ac32bf |
+{
|
|
|
ac32bf |
+ int rc;
|
|
|
ac32bf |
+ struct sqlite3_priv *priv = ras->db_priv;
|
|
|
ac32bf |
+
|
|
|
ac32bf |
+ if (!priv || !priv->stmt_mc_event)
|
|
|
ac32bf |
+ return 0;
|
|
|
ac32bf |
+ log(TERM, LOG_INFO, "mc_event store: %p\n", priv->stmt_mc_event);
|
|
|
ac32bf |
+
|
|
|
ac32bf |
+ sqlite3_bind_text(priv->stmt_mc_event, 1, ev->timestamp, -1, NULL);
|
|
|
ac32bf |
+ sqlite3_bind_int (priv->stmt_mc_event, 2, ev->error_count);
|
|
|
ac32bf |
+ sqlite3_bind_text(priv->stmt_mc_event, 3, ev->error_type, -1, NULL);
|
|
|
ac32bf |
+ sqlite3_bind_text(priv->stmt_mc_event, 4, ev->msg, -1, NULL);
|
|
|
ac32bf |
+ sqlite3_bind_text(priv->stmt_mc_event, 5, ev->label, -1, NULL);
|
|
|
ac32bf |
+ sqlite3_bind_int (priv->stmt_mc_event, 6, ev->mc_index);
|
|
|
ac32bf |
+ sqlite3_bind_int (priv->stmt_mc_event, 7, ev->top_layer);
|
|
|
ac32bf |
+ sqlite3_bind_int (priv->stmt_mc_event, 8, ev->middle_layer);
|
|
|
ac32bf |
+ sqlite3_bind_int (priv->stmt_mc_event, 9, ev->lower_layer);
|
|
|
ac32bf |
+ sqlite3_bind_int (priv->stmt_mc_event, 10, ev->address);
|
|
|
ac32bf |
+ sqlite3_bind_int (priv->stmt_mc_event, 11, ev->grain);
|
|
|
ac32bf |
+ sqlite3_bind_int (priv->stmt_mc_event, 12, ev->syndrome);
|
|
|
ac32bf |
+ sqlite3_bind_text(priv->stmt_mc_event, 13, ev->driver_detail, -1, NULL);
|
|
|
ac32bf |
+ rc = sqlite3_step(priv->stmt_mc_event);
|
|
|
ac32bf |
+ if (rc != SQLITE_OK && rc != SQLITE_DONE)
|
|
|
ac32bf |
+ log(TERM, LOG_ERR,
|
|
|
ac32bf |
+ "Failed to do mc_event step on sqlite: error = %d\n", rc);
|
|
|
ac32bf |
+ rc = sqlite3_reset(priv->stmt_mc_event);
|
|
|
ac32bf |
+ if (rc != SQLITE_OK && rc != SQLITE_DONE)
|
|
|
ac32bf |
+ log(TERM, LOG_ERR,
|
|
|
ac32bf |
+ "Failed reset mc_event on sqlite: error = %d\n",
|
|
|
ac32bf |
+ rc);
|
|
|
ac32bf |
+ log(TERM, LOG_INFO, "register inserted at db\n");
|
|
|
ac32bf |
+
|
|
|
ac32bf |
+ return rc;
|
|
|
ac32bf |
+}
|
|
|
ac32bf |
|
|
|
ac32bf |
static int ras_mc_prepare_stmt(struct sqlite3_priv *priv,
|
|
|
ac32bf |
sqlite3_stmt **stmt,
|
|
|
ac32bf |
@@ -208,39 +245,3 @@ int ras_mc_event_opendb(unsigned cpu, struct ras_events *ras)
|
|
|
ac32bf |
|
|
|
ac32bf |
return 0;
|
|
|
ac32bf |
}
|
|
|
ac32bf |
-
|
|
|
ac32bf |
-int ras_store_mc_event(struct ras_events *ras, struct ras_mc_event *ev)
|
|
|
ac32bf |
-{
|
|
|
ac32bf |
- int rc;
|
|
|
ac32bf |
- struct sqlite3_priv *priv = ras->db_priv;
|
|
|
ac32bf |
-
|
|
|
ac32bf |
- if (!priv || !priv->stmt_mc_event)
|
|
|
ac32bf |
- return 0;
|
|
|
ac32bf |
- log(TERM, LOG_INFO, "mc_event store: %p\n", priv->stmt_mc_event);
|
|
|
ac32bf |
-
|
|
|
ac32bf |
- sqlite3_bind_text(priv->stmt_mc_event, 1, ev->timestamp, -1, NULL);
|
|
|
ac32bf |
- sqlite3_bind_int (priv->stmt_mc_event, 2, ev->error_count);
|
|
|
ac32bf |
- sqlite3_bind_text(priv->stmt_mc_event, 3, ev->error_type, -1, NULL);
|
|
|
ac32bf |
- sqlite3_bind_text(priv->stmt_mc_event, 4, ev->msg, -1, NULL);
|
|
|
ac32bf |
- sqlite3_bind_text(priv->stmt_mc_event, 5, ev->label, -1, NULL);
|
|
|
ac32bf |
- sqlite3_bind_int (priv->stmt_mc_event, 6, ev->mc_index);
|
|
|
ac32bf |
- sqlite3_bind_int (priv->stmt_mc_event, 7, ev->top_layer);
|
|
|
ac32bf |
- sqlite3_bind_int (priv->stmt_mc_event, 8, ev->middle_layer);
|
|
|
ac32bf |
- sqlite3_bind_int (priv->stmt_mc_event, 9, ev->lower_layer);
|
|
|
ac32bf |
- sqlite3_bind_int (priv->stmt_mc_event, 10, ev->address);
|
|
|
ac32bf |
- sqlite3_bind_int (priv->stmt_mc_event, 11, ev->grain);
|
|
|
ac32bf |
- sqlite3_bind_int (priv->stmt_mc_event, 12, ev->syndrome);
|
|
|
ac32bf |
- sqlite3_bind_text(priv->stmt_mc_event, 13, ev->driver_detail, -1, NULL);
|
|
|
ac32bf |
- rc = sqlite3_step(priv->stmt_mc_event);
|
|
|
ac32bf |
- if (rc != SQLITE_OK && rc != SQLITE_DONE)
|
|
|
ac32bf |
- log(TERM, LOG_ERR,
|
|
|
ac32bf |
- "Failed to do mc_event step on sqlite: error = %d\n", rc);
|
|
|
ac32bf |
- rc = sqlite3_reset(priv->stmt_mc_event);
|
|
|
ac32bf |
- if (rc != SQLITE_OK && rc != SQLITE_DONE)
|
|
|
ac32bf |
- log(TERM, LOG_ERR,
|
|
|
ac32bf |
- "Failed reset mc_event on sqlite: error = %d\n",
|
|
|
ac32bf |
- rc);
|
|
|
ac32bf |
- log(TERM, LOG_INFO, "register inserted at db\n");
|
|
|
ac32bf |
-
|
|
|
ac32bf |
- return rc;
|
|
|
ac32bf |
-}
|
|
|
ac32bf |
--
|
|
|
ac32bf |
1.7.1
|
|
|
ac32bf |
|