hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of some basic statistics on the DCB

Browse Source
This commit is contained in:
Mark Riddoch
2013-06-12 13:08:33 +01:00
parent c7f533abaf
commit 08549ad5ae
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/dcb.c
View File

@ -27,6 +27,7 @@
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <dcb.h>
#include <spinlock.h>
@ -60,6 +61,7 @@ DCB *rval;
spinlock_init(&rval->writeqlock);
rval->writeq = NULL;
rval->state = DCB_STATE_ALLOC;
memset(&rval->stats, 0, sizeof(DCBSTATS)); // Zero the statistics
spinlock_acquire(dcbspin);
if (allDCBs == NULL)
@ -114,6 +116,10 @@ printDCB(DCB *dcb)
(void)printf("DCB: 0x%x\n", (void *)dcb);
(void)printf("\tDCB state: %s\n", gw_dcb_state2string(dcb->state));
(void)printf("\tQueued write data: %d\n", gwbuf_length(dcb->writeq));
(void)printf("\tStatistics:\n");
(void)printf("\t\tNo. of Reads: %d\n", dcb->stats.n_reads);
(void)printf("\t\tNo. of Writes: %d\n", dcb->stats.n_writes);
(void)printf("\t\tNo. of Accepts: %d\n", dcb->stats.n_accepts);
}
/*

13
core/utils.c
View File

@ -61,8 +61,6 @@ int gw_read_backend_event(DCB *dcb, int epfd) {
if ((client_protocol->state == MYSQL_WAITING_RESULT) || (client_protocol->state == MYSQL_IDLE)) {
struct epoll_event new_event;
int w;
int count_reads = 0;
int count_writes = 0;
int b = -1;
int tot_b = -1;
uint8_t *ptr_buffer;
@ -86,7 +84,7 @@ int gw_read_backend_event(DCB *dcb, int epfd) {
/* Bad news, we have run out of memory */
return 0;
}
GW_NOINTR_CALL(n = read(dcb->fd, GWBUF_DATA(buffer), bufsize); count_reads++);
GW_NOINTR_CALL(n = read(dcb->fd, GWBUF_DATA(buffer), bufsize); dcb->stats.n_reads++);
head = gwbuf_append(head, buffer);
}
@ -115,7 +113,7 @@ int gw_read_backend_event(DCB *dcb, int epfd) {
int
MySQLWrite(DCB *dcb, GWBUF *queue)
{
int w, count_writes = 0, saved_errno = 0;
int w, saved_errno = 0;
spinlock_acquire(&dcb->writeqlock);
if (dcb->writeq)
@ -144,7 +142,7 @@ int w, count_writes = 0, saved_errno = 0;
while (queue != NULL)
{
len = GWBUF_LENGTH(queue);
GW_NOINTR_CALL(w = write(dcb->fd, GWBUF_DATA(queue), len); count_writes++);
GW_NOINTR_CALL(w = write(dcb->fd, GWBUF_DATA(queue), len); dcb->stats.n_writes++);
saved_errno = errno;
if (w < 0)
{
@ -536,7 +534,6 @@ void MySQLListener(int epfd, char *config_bind) {
int MySQLAccept(DCB *listener, int efd) {
int accept_counter = 0;
fprintf(stderr, "MySQL Listener socket is: %i\n", listener->fd);
@ -569,9 +566,9 @@ int MySQLAccept(DCB *listener, int efd) {
}
}
accept_counter++;
listener->stats.n_accepts++;
fprintf(stderr, "Processing %i connection fd %i for listener %i\n", accept_counter, c_sock, listener->fd);
fprintf(stderr, "Processing %i connection fd %i for listener %i\n", listener->stats.n_accepts, c_sock, listener->fd);
// set nonblocking
setsockopt(c_sock, SOL_SOCKET, SO_SNDBUF, &sendbuf, optlen);

7
include/dcb.h
View File

@ -59,6 +59,11 @@ typedef struct gw_protocol {
int (*close)(struct dcb *, int);
} GWPROTOCOL;
typedef struct dcbstats {
int n_reads; /* Number of reads on this descriptor */
int n_writes; /* Number of writes on this descriptor */
int n_accepts; /* Number of accepts on this descriptor */
} DCBSTATS;
/*
* Descriptor Control Block
*/
@ -72,7 +77,7 @@ typedef struct dcb {
SPINLOCK writeqlock; /* Write Queue spinlock */
GWBUF *writeq; /* Write Data Queue */
DCBSTATS stats; /* DCB related statistics */
struct dcb *next; /* Next DCB in the chain of allocated DCB's */
} DCB;