mirror of
https://github.com/worldforge/cyphesis
synced 2026-08-13 12:26:04 -04:00
* tests/EntityExerciser.h, server/CommPSQLSocket.cpp: Add <cassert> to keep gcc 3.3 happy. * tools/cyconfig.cpp: Clean up formatting.
81 lines
1.9 KiB
C++
81 lines
1.9 KiB
C++
// This file may be redistributed and modified only under the terms of
|
|
// the GNU General Public License (See COPYING for details).
|
|
// Copyright (C) 2003 Alistair Riddoch
|
|
|
|
#include "CommPSQLSocket.h"
|
|
|
|
#include "common/Database.h"
|
|
#include "common/log.h"
|
|
|
|
#include <cassert>
|
|
|
|
CommPSQLSocket::CommPSQLSocket(CommServer & svr, Database & db) :
|
|
CommIdleSocket(svr), m_db(db)
|
|
{
|
|
// This assumes the database connection is already sorted, which I think
|
|
// is okay
|
|
PGconn * con = m_db.getConnection();
|
|
assert(con != 0);
|
|
|
|
if (PQsetnonblocking(con, 1) == -1) {
|
|
log(ERROR, "Unable to put database connection in non-blocking mode.");
|
|
}
|
|
}
|
|
|
|
CommPSQLSocket::~CommPSQLSocket()
|
|
{
|
|
}
|
|
|
|
int CommPSQLSocket::getFd() const
|
|
{
|
|
PGconn * con = m_db.getConnection();
|
|
assert(con != 0);
|
|
return PQsocket(con);
|
|
}
|
|
|
|
bool CommPSQLSocket::eof()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool CommPSQLSocket::isOpen() const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
bool CommPSQLSocket::read()
|
|
{
|
|
PGconn * con = m_db.getConnection();
|
|
assert(con != 0);
|
|
|
|
if (PQconsumeInput(con) == 0) {
|
|
log(ERROR, "Error reading from database connection.");
|
|
m_db.reportError();
|
|
}
|
|
|
|
PGresult * res;
|
|
while ((PQisBusy(con) == 0) && ((res = PQgetResult(m_connection)) != 0)) {
|
|
// FIXME
|
|
// Get and check result against current query using
|
|
// PQresultStatus(res), PQclear(res). If NULL is read, then
|
|
// we need to signal that the next query can be sent, so the while
|
|
// logic needs to be fixed.
|
|
};
|
|
|
|
return false;
|
|
}
|
|
|
|
void CommPSQLSocket::dispatch()
|
|
{
|
|
PGconn * con = m_db.getConnection();
|
|
assert(con != 0);
|
|
|
|
// FIXME
|
|
// Here we are permited to write the next query, if there is one,
|
|
// and read() allows us to do this.
|
|
// Perhaps PQflush(con); ? Must be called after writing a non-blocking query
|
|
}
|
|
|
|
void CommPSQLSocket::idle(time_t t)
|
|
{
|
|
}
|