pike.git/ lib/ modules/ Sql.pmod/ pgsql_util.pmod

2014-11-13

2014-11-13 14:40:58 by Stephen R. van den Berg <srb@cuci.nl>

• 35dc2843936721b3bc9fd792a3bce7b0fd2f3a50 (34 lines) (+24/-10) ^{[ Show | Annotate ]}
  Branch: 8.1

pgsql: Close race between a parse in progress and a Sync.

243:    final void sendcmd(void|sctype mode,void|pgsql_result portal) {    if(portal)    queueup(portal); -  if(mode==flushlogsend) { -  mode=flushsend; qportals->write(synctransact++); + nosync: +  do { +  switch(mode) { +  default: +  break nosync; +  case syncsend: +  PD(">Sync %d %d Queue\n",synctransact,++queueoutidx); +  add(PGSYNC); +  mode=sendout; +  break; +  case flushlogsend:    PD(">%O %d Queue simplequery %d bytes\n",portal._portalname,    ++queueoutidx,sizeof(this)); -  +  mode=flushsend;    } -  +  qportals->write(synctransact++); +  } while(0);    if(started) {    Thread.MutexKey lock=stashupdate->lock();    if(sizeof(stash)) {
265:    switch(mode) {    default:    break outer; -  case syncsend: -  PD(">Sync %d %d Queue\n",synctransact,++queueoutidx); -  qportals->write(synctransact++); add(PGSYNC); -  break; +     case flushsend:    PD("Flush\n");    add(PGFLUSH);
722:    PD("%O Try Closeportal %d\n",_portalname,_state);    Thread.MutexKey lock=closemux->lock();    _fetchlimit=0; // disables further Executes +  int alreadyfilled=sizeof(plugbuffer); +  /* alreadyfilled will be non-zero if a parse request has been queued +  * before the close was initiated. +  * It's a bit of a tricky race, but this check should be sufficient. +  */    switch(_state) {    case portalinit:    _state=closed;
738:    retval=flushsend;    } else    _unnamedportalkey=0; -  if(!--pgsqlsess->_portalsinflight) { +  if(!--pgsqlsess->_portalsinflight && !alreadyfilled) {    pgsqlsess->_readyforquerycount++;    pgsqlsess->_pportalcount=0;    retval=syncsend;