Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add asic compile/switch skeleton in redis/syncd #9

Merged
merged 6 commits into from
Apr 25, 2016
+356 −25
Merged

Add asic compile/switch skeleton in redis/syncd #9

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2e0161c
Prevent copy and assignment for SaiAttributeList
kcudnik Apr 19, 2016
083e001
Make sairedis threadsafe
kcudnik Apr 13, 2016
2819a67
Add asic compile/switch skeleton in redis/syncd
kcudnik Apr 15, 2016
82efc37
Add SaiAttribute class
kcudnik Apr 11, 2016
874da8e
Fix producer and consumer calls
kcudnik Apr 20, 2016
f17c3a0
Add more serialization types
kcudnik Apr 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix producer and consumer calls
@kcudnik
kcudnik committed Apr 20, 2016
commit 874da8eede12afcd1baff647ff6d8296a0b10c88
4 changes: 2 additions & 2 deletions lib/src/sai_redis_interfacequery.cpp
View file
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ sai_status_t sai_api_initialize(
if (g_notifySyncdProducer != NULL)
delete g_notifySyncdProducer;

g_notifySyncdProducer = new swss::ProducerTable(g_db, "NOTIFYSYNCDREQUERY", false);
g_notifySyncdProducer = new swss::ProducerTable(g_db, "NOTIFYSYNCDREQUERY");

if (g_redisGetProducer != NULL)
delete g_redisGetProducer;
@@ -70,7 +70,7 @@ sai_status_t sai_api_initialize(
if (g_notifySyncdConsumer != NULL)
delete g_notifySyncdConsumer;

g_notifySyncdConsumer = new swss::ConsumerTable(g_db, "NOTIFYSYNCRESPONSE", false);
g_notifySyncdConsumer = new swss::ConsumerTable(g_db, "NOTIFYSYNCRESPONSE");

if (g_redisGetConsumer != NULL)
delete g_redisGetConsumer;
4 changes: 2 additions & 2 deletions syncd/syncd.cpp
View file
Original file line number Diff line number Diff line change
@@ -913,15 +913,15 @@ int main(int argc, char **argv)
updateLogLevel();

swss::ConsumerTable *asicState = new swss::ConsumerTable(db, "ASIC_STATE");
swss::ConsumerTable *notifySyncdQuery = new swss::ConsumerTable(db, "NOTIFYSYNCDREQUERY", false);
swss::ConsumerTable *notifySyncdQuery = new swss::ConsumerTable(db, "NOTIFYSYNCDREQUERY");

// at the end we cant use producer consumer concept since
// if one proces will restart there may be something in the queue
// also "remove" from response queue will also trigger another "response"
getRequest = new swss::ConsumerTable(db, "GETREQUEST");
getResponse = new swss::ProducerTable(db, "GETRESPONSE");
notifications = new swss::ProducerTable(dbNtf, "NOTIFICATIONS");
notifySyncdResponse = new swss::ProducerTable(db, "NOTIFYSYNCDRESPONSE", false);
notifySyncdResponse = new swss::ProducerTable(db, "NOTIFYSYNCDRESPONSE");

#ifdef MLNXSAI
std::string mlnx_config_file = "/etc/ssw/ACS-MSN2700/sai_2700.xml";