Skip to content

Conversation

@jmikola
Copy link
Member

@jmikola jmikola commented Mar 28, 2017

Related to: #466

Copy link
Contributor

@derickr derickr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost OK, just two questions.

mongoc_client_t *client;
char *command_name;
uint32_t server_id;
int server_id;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is curious. For some of the event_ts we use int, and sometimes uint32_t for this. One of them is right...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The server and cursor structs use int. I'm not sure where uint32_t came from.

I believe this is only a diff because I re-ordered the struct definitions to be alphabetical; however, it'd be a good idea to make them consistent.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you fix this one in your PR so I can merge it cleanly then?

#ifndef PHONGO_MONITORING_H
#define PHONGO_MONITORING_H

#include <php.h>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you add this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

php.h is where PHP_FUNCTION() is defined. This wasn't an error before as you generally have php.h included before this file, but I considered it good practice to have headers include their dependencies.

mongoc_client_t *client;
char *command_name;
uint32_t server_id;
int server_id;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you fix this one in your PR so I can merge it cleanly then?

@derickr
Copy link
Contributor

derickr commented Mar 30, 2017

These last two commits made Travis unhappy...

@derickr derickr merged commit e8cdf3e into mongodb:PHPC-349-apm Mar 31, 2017
@jmikola jmikola deleted the phpc-349-fixes branch March 31, 2017 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants