Setting tag sliver-openvswitch-2.2.90-1

[sliver-openvswitch.git] / ovsdb / trigger.c

diff --git a/ovsdb/trigger.c b/ovsdb/trigger.c
index b2eb011..74a1b0f 100644 (file)
--- a/ovsdb/trigger.c
+++ b/ovsdb/trigger.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 
 #include "trigger.h"
 
-#include <assert.h>
 #include <limits.h>
 
 #include "json.h"
@@ -30,12 +29,13 @@ static bool ovsdb_trigger_try(struct ovsdb_trigger *, long long int now);
 static void ovsdb_trigger_complete(struct ovsdb_trigger *);
 
 void
-ovsdb_trigger_init(struct ovsdb_session *session,
+ovsdb_trigger_init(struct ovsdb_session *session, struct ovsdb *db,
                    struct ovsdb_trigger *trigger,
                    struct json *request, long long int now)
 {
     trigger->session = session;
-    list_push_back(&trigger->session->db->triggers, &trigger->node);
+    trigger->db = db;
+    list_push_back(&trigger->db->triggers, &trigger->node);
     trigger->request = request;
     trigger->result = NULL;
     trigger->created = now;
@@ -110,8 +110,8 @@ ovsdb_trigger_wait(struct ovsdb *db, long long int now)
 static bool
 ovsdb_trigger_try(struct ovsdb_trigger *t, long long int now)
 {
-    t->result = ovsdb_execute(t->session->db, t->request,
-                              now - t->created, &t->timeout_msec);
+    t->result = ovsdb_execute(t->db, t->session,
+                              t->request, now - t->created, &t->timeout_msec);
     if (t->result) {
         ovsdb_trigger_complete(t);
         return true;
@@ -123,7 +123,7 @@ ovsdb_trigger_try(struct ovsdb_trigger *t, long long int now)
 static void
 ovsdb_trigger_complete(struct ovsdb_trigger *t)
 {
-    assert(t->result != NULL);
+    ovs_assert(t->result != NULL);
     list_remove(&t->node);
     list_push_back(&t->session->completions, &t->node);
 }