| Message ID | 20160713233838.47648-4-vsairam@vmware.com |
|---|---|
| State | Superseded |
| Delegated to: | Guru Shetty |
| Headers | show |
Acked-By: Yin Lin <linyi@vmware.com> On Wed, Jul 13, 2016 at 4:38 PM, Sairam Venugopal <vsairam@vmware.com> wrote: > Update the datapath to refer to events as vportEvents. This will aid in > the introduction of other events. > > Signed-off-by: Sairam Venugopal <vsairam@vmware.com> > --- > datapath-windows/ovsext/Datapath.c | 3 ++- > datapath-windows/ovsext/Event.c | 10 +++++----- > datapath-windows/ovsext/Event.h | 7 ++++--- > datapath-windows/ovsext/Vport.c | 6 +++--- > 4 files changed, 14 insertions(+), 12 deletions(-) > > diff --git a/datapath-windows/ovsext/Datapath.c > b/datapath-windows/ovsext/Datapath.c > index 42af450..e4d6ab1 100644 > --- a/datapath-windows/ovsext/Datapath.c > +++ b/datapath-windows/ovsext/Datapath.c > @@ -1675,7 +1675,8 @@ OvsReadEventCmdHandler(POVS_USER_PARAMS_CONTEXT > usrParamsCtx, > NlBufInit(&nlBuf, usrParamsCtx->outputBuffer, > usrParamsCtx->outputLength); > > /* remove an event entry from the event queue */ > - status = OvsRemoveEventEntry(usrParamsCtx->ovsInstance, &eventEntry); > + status = OvsRemoveVportEventEntry(usrParamsCtx->ovsInstance, > + &eventEntry); > if (status != STATUS_SUCCESS) { > /* If there were not elements, read should return no data. */ > status = STATUS_SUCCESS; > diff --git a/datapath-windows/ovsext/Event.c > b/datapath-windows/ovsext/Event.c > index 53ee556..8c7c3ec 100644 > --- a/datapath-windows/ovsext/Event.c > +++ b/datapath-windows/ovsext/Event.c > @@ -109,7 +109,7 @@ OvsCleanupEvent(POVS_OPEN_INSTANCE instance) > * > -------------------------------------------------------------------------- > */ > VOID > -OvsPostEvent(POVS_VPORT_EVENT_ENTRY event) > +OvsPostVportEvent(POVS_VPORT_EVENT_ENTRY event) > { > POVS_EVENT_QUEUE_ELEM elem; > POVS_EVENT_QUEUE queue; > @@ -141,7 +141,7 @@ OvsPostEvent(POVS_VPORT_EVENT_ENTRY event) > return; > } > > - RtlCopyMemory(&elem->event, event, sizeof elem->event); > + RtlCopyMemory(&elem->vportEvent, event, sizeof elem->vportEvent); > InsertTailList(&queue->elemList, &elem->link); > queue->numElems++; > OVS_LOG_INFO("Queue: %p, numElems: %d", > @@ -409,8 +409,8 @@ unlock: > * > -------------------------------------------------------------------------- > */ > NTSTATUS > -OvsRemoveEventEntry(POVS_OPEN_INSTANCE instance, > - POVS_VPORT_EVENT_ENTRY entry) > +OvsRemoveVportEventEntry(POVS_OPEN_INSTANCE instance, > + POVS_VPORT_EVENT_ENTRY entry) > { > NTSTATUS status = STATUS_UNSUCCESSFUL; > POVS_EVENT_QUEUE queue; > @@ -427,7 +427,7 @@ OvsRemoveEventEntry(POVS_OPEN_INSTANCE instance, > > if (queue->numElems) { > elem = (POVS_EVENT_QUEUE_ELEM)RemoveHeadList(&queue->elemList); > - *entry = elem->event; > + *entry = elem->vportEvent; > OvsFreeMemoryWithTag(elem, OVS_EVENT_POOL_TAG); > queue->numElems--; > status = STATUS_SUCCESS; > diff --git a/datapath-windows/ovsext/Event.h > b/datapath-windows/ovsext/Event.h > index fe03f0e..255594c 100644 > --- a/datapath-windows/ovsext/Event.h > +++ b/datapath-windows/ovsext/Event.h > @@ -19,7 +19,7 @@ > > typedef struct _OVS_EVENT_QUEUE_ELEM { > LIST_ENTRY link; > - OVS_VPORT_EVENT_ENTRY event; > + OVS_VPORT_EVENT_ENTRY vportEvent; > } OVS_EVENT_QUEUE_ELEM, *POVS_EVENT_QUEUE_ELEM; > > typedef struct _OVS_EVENT_QUEUE { > @@ -38,7 +38,7 @@ VOID OvsCleanupEventQueue(VOID); > struct _OVS_OPEN_INSTANCE; > > VOID OvsCleanupEvent(struct _OVS_OPEN_INSTANCE *instance); > -VOID OvsPostEvent(POVS_VPORT_EVENT_ENTRY event); > +VOID OvsPostVportEvent(POVS_VPORT_EVENT_ENTRY event); > NTSTATUS OvsSubscribeEventIoctl(PFILE_OBJECT fileObject, PVOID > inputBuffer, > UINT32 inputLength); > NTSTATUS OvsPollEventIoctl(PFILE_OBJECT fileObject, PVOID inputBuffer, > @@ -46,6 +46,7 @@ NTSTATUS OvsPollEventIoctl(PFILE_OBJECT fileObject, > PVOID inputBuffer, > UINT32 outputLength, UINT32 *replyLen); > NTSTATUS OvsWaitEventIoctl(PIRP irp, PFILE_OBJECT fileObject, > PVOID inputBuffer, UINT32 inputLength); > -NTSTATUS OvsRemoveEventEntry(PVOID instance, POVS_VPORT_EVENT_ENTRY > entry); > +NTSTATUS OvsRemoveVportEventEntry(POVS_OPEN_INSTANCE instance, > + POVS_VPORT_EVENT_ENTRY entry); > > #endif /* __EVENT_H_ */ > diff --git a/datapath-windows/ovsext/Vport.c > b/datapath-windows/ovsext/Vport.c > index 534d76a..23e1e04 100644 > --- a/datapath-windows/ovsext/Vport.c > +++ b/datapath-windows/ovsext/Vport.c > @@ -300,7 +300,7 @@ HvDeletePort(POVS_SWITCH_CONTEXT switchContext, > RtlCopyMemory(&event.ovsName, &vport->ovsName, sizeof > event.ovsName); > event.type = OVS_EVENT_LINK_DOWN; > OvsRemoveAndDeleteVport(NULL, switchContext, vport, TRUE, FALSE); > - OvsPostEvent(&event); > + OvsPostVportEvent(&event); > } else { > OVS_LOG_WARN("Vport not present."); > } > @@ -538,7 +538,7 @@ HvUpdateNic(POVS_SWITCH_CONTEXT switchContext, > RtlCopyMemory(&evt.ovsName, &vport->ovsName, sizeof evt.ovsName); > evt.type = OVS_EVENT_LINK_DOWN; > OvsRemoveAndDeleteVport(NULL, switchContext, vport, FALSE, TRUE); > - OvsPostEvent(&evt); > + OvsPostVportEvent(&evt); > } > > NdisReleaseRWLock(switchContext->dispatchLock, &lockState); > @@ -609,7 +609,7 @@ HvDisconnectNic(POVS_SWITCH_CONTEXT switchContext, > */ > if (OvsIsRealExternalVport(vport)) { > OvsRemoveAndDeleteVport(NULL, switchContext, vport, FALSE, TRUE); > - OvsPostEvent(&event); > + OvsPostVportEvent(&event); > } > NdisReleaseRWLock(switchContext->dispatchLock, &lockState); > > -- > 2.9.0.windows.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev >
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> > -----Mesaj original----- > De la: dev [mailto:dev-bounces@openvswitch.org] În numele Sairam > Venugopal > Trimis: Thursday, July 14, 2016 2:39 AM > Către: dev@openvswitch.org > Subiect: [ovs-dev] [PATCH 3/9] datapath-windows: Explicitly name vport > related event to vportEvent > > Update the datapath to refer to events as vportEvents. This will aid in the > introduction of other events. > > Signed-off-by: Sairam Venugopal <vsairam@vmware.com> > --- > datapath-windows/ovsext/Datapath.c | 3 ++- > datapath-windows/ovsext/Event.c | 10 +++++----- > datapath-windows/ovsext/Event.h | 7 ++++--- > datapath-windows/ovsext/Vport.c | 6 +++--- > 4 files changed, 14 insertions(+), 12 deletions(-) > > diff --git a/datapath-windows/ovsext/Datapath.c b/datapath- > windows/ovsext/Datapath.c > index 42af450..e4d6ab1 100644 > --- a/datapath-windows/ovsext/Datapath.c > +++ b/datapath-windows/ovsext/Datapath.c > @@ -1675,7 +1675,8 @@ > OvsReadEventCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx, > NlBufInit(&nlBuf, usrParamsCtx->outputBuffer, usrParamsCtx- > >outputLength); > > /* remove an event entry from the event queue */ > - status = OvsRemoveEventEntry(usrParamsCtx->ovsInstance, > &eventEntry); > + status = OvsRemoveVportEventEntry(usrParamsCtx->ovsInstance, > + &eventEntry); > if (status != STATUS_SUCCESS) { > /* If there were not elements, read should return no data. */ > status = STATUS_SUCCESS; > diff --git a/datapath-windows/ovsext/Event.c b/datapath- > windows/ovsext/Event.c index 53ee556..8c7c3ec 100644 > --- a/datapath-windows/ovsext/Event.c > +++ b/datapath-windows/ovsext/Event.c > @@ -109,7 +109,7 @@ OvsCleanupEvent(POVS_OPEN_INSTANCE instance) > * -------------------------------------------------------------------------- > */ > VOID > -OvsPostEvent(POVS_VPORT_EVENT_ENTRY event) > +OvsPostVportEvent(POVS_VPORT_EVENT_ENTRY event) > { > POVS_EVENT_QUEUE_ELEM elem; > POVS_EVENT_QUEUE queue; > @@ -141,7 +141,7 @@ OvsPostEvent(POVS_VPORT_EVENT_ENTRY event) > return; > } > > - RtlCopyMemory(&elem->event, event, sizeof elem->event); > + RtlCopyMemory(&elem->vportEvent, event, sizeof > + elem->vportEvent); > InsertTailList(&queue->elemList, &elem->link); > queue->numElems++; > OVS_LOG_INFO("Queue: %p, numElems: %d", @@ -409,8 +409,8 @@ > unlock: > * -------------------------------------------------------------------------- > */ > NTSTATUS > -OvsRemoveEventEntry(POVS_OPEN_INSTANCE instance, > - POVS_VPORT_EVENT_ENTRY entry) > +OvsRemoveVportEventEntry(POVS_OPEN_INSTANCE instance, > + POVS_VPORT_EVENT_ENTRY entry) > { > NTSTATUS status = STATUS_UNSUCCESSFUL; > POVS_EVENT_QUEUE queue; > @@ -427,7 +427,7 @@ OvsRemoveEventEntry(POVS_OPEN_INSTANCE > instance, > > if (queue->numElems) { > elem = (POVS_EVENT_QUEUE_ELEM)RemoveHeadList(&queue- > >elemList); > - *entry = elem->event; > + *entry = elem->vportEvent; > OvsFreeMemoryWithTag(elem, OVS_EVENT_POOL_TAG); > queue->numElems--; > status = STATUS_SUCCESS; > diff --git a/datapath-windows/ovsext/Event.h b/datapath- > windows/ovsext/Event.h index fe03f0e..255594c 100644 > --- a/datapath-windows/ovsext/Event.h > +++ b/datapath-windows/ovsext/Event.h > @@ -19,7 +19,7 @@ > > typedef struct _OVS_EVENT_QUEUE_ELEM { > LIST_ENTRY link; > - OVS_VPORT_EVENT_ENTRY event; > + OVS_VPORT_EVENT_ENTRY vportEvent; > } OVS_EVENT_QUEUE_ELEM, *POVS_EVENT_QUEUE_ELEM; > > typedef struct _OVS_EVENT_QUEUE { > @@ -38,7 +38,7 @@ VOID OvsCleanupEventQueue(VOID); struct > _OVS_OPEN_INSTANCE; > > VOID OvsCleanupEvent(struct _OVS_OPEN_INSTANCE *instance); -VOID > OvsPostEvent(POVS_VPORT_EVENT_ENTRY event); > +VOID OvsPostVportEvent(POVS_VPORT_EVENT_ENTRY event); > NTSTATUS OvsSubscribeEventIoctl(PFILE_OBJECT fileObject, PVOID > inputBuffer, > UINT32 inputLength); NTSTATUS > OvsPollEventIoctl(PFILE_OBJECT fileObject, PVOID inputBuffer, @@ -46,6 > +46,7 @@ NTSTATUS OvsPollEventIoctl(PFILE_OBJECT fileObject, PVOID > inputBuffer, > UINT32 outputLength, UINT32 *replyLen); NTSTATUS > OvsWaitEventIoctl(PIRP irp, PFILE_OBJECT fileObject, > PVOID inputBuffer, UINT32 inputLength); -NTSTATUS > OvsRemoveEventEntry(PVOID instance, POVS_VPORT_EVENT_ENTRY > entry); > +NTSTATUS OvsRemoveVportEventEntry(POVS_OPEN_INSTANCE instance, > + POVS_VPORT_EVENT_ENTRY entry); > > #endif /* __EVENT_H_ */ > diff --git a/datapath-windows/ovsext/Vport.c b/datapath- > windows/ovsext/Vport.c index 534d76a..23e1e04 100644 > --- a/datapath-windows/ovsext/Vport.c > +++ b/datapath-windows/ovsext/Vport.c > @@ -300,7 +300,7 @@ HvDeletePort(POVS_SWITCH_CONTEXT > switchContext, > RtlCopyMemory(&event.ovsName, &vport->ovsName, sizeof > event.ovsName); > event.type = OVS_EVENT_LINK_DOWN; > OvsRemoveAndDeleteVport(NULL, switchContext, vport, TRUE, FALSE); > - OvsPostEvent(&event); > + OvsPostVportEvent(&event); > } else { > OVS_LOG_WARN("Vport not present."); > } > @@ -538,7 +538,7 @@ HvUpdateNic(POVS_SWITCH_CONTEXT > switchContext, > RtlCopyMemory(&evt.ovsName, &vport->ovsName, sizeof > evt.ovsName); > evt.type = OVS_EVENT_LINK_DOWN; > OvsRemoveAndDeleteVport(NULL, switchContext, vport, FALSE, TRUE); > - OvsPostEvent(&evt); > + OvsPostVportEvent(&evt); > } > > NdisReleaseRWLock(switchContext->dispatchLock, &lockState); @@ - > 609,7 +609,7 @@ HvDisconnectNic(POVS_SWITCH_CONTEXT switchContext, > */ > if (OvsIsRealExternalVport(vport)) { > OvsRemoveAndDeleteVport(NULL, switchContext, vport, FALSE, TRUE); > - OvsPostEvent(&event); > + OvsPostVportEvent(&event); > } > NdisReleaseRWLock(switchContext->dispatchLock, &lockState); > > -- > 2.9.0.windows.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev
diff --git a/datapath-windows/ovsext/Datapath.c b/datapath-windows/ovsext/Datapath.c index 42af450..e4d6ab1 100644 --- a/datapath-windows/ovsext/Datapath.c +++ b/datapath-windows/ovsext/Datapath.c @@ -1675,7 +1675,8 @@ OvsReadEventCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx, NlBufInit(&nlBuf, usrParamsCtx->outputBuffer, usrParamsCtx->outputLength); /* remove an event entry from the event queue */ - status = OvsRemoveEventEntry(usrParamsCtx->ovsInstance, &eventEntry); + status = OvsRemoveVportEventEntry(usrParamsCtx->ovsInstance, + &eventEntry); if (status != STATUS_SUCCESS) { /* If there were not elements, read should return no data. */ status = STATUS_SUCCESS; diff --git a/datapath-windows/ovsext/Event.c b/datapath-windows/ovsext/Event.c index 53ee556..8c7c3ec 100644 --- a/datapath-windows/ovsext/Event.c +++ b/datapath-windows/ovsext/Event.c @@ -109,7 +109,7 @@ OvsCleanupEvent(POVS_OPEN_INSTANCE instance) * -------------------------------------------------------------------------- */ VOID -OvsPostEvent(POVS_VPORT_EVENT_ENTRY event) +OvsPostVportEvent(POVS_VPORT_EVENT_ENTRY event) { POVS_EVENT_QUEUE_ELEM elem; POVS_EVENT_QUEUE queue; @@ -141,7 +141,7 @@ OvsPostEvent(POVS_VPORT_EVENT_ENTRY event) return; } - RtlCopyMemory(&elem->event, event, sizeof elem->event); + RtlCopyMemory(&elem->vportEvent, event, sizeof elem->vportEvent); InsertTailList(&queue->elemList, &elem->link); queue->numElems++; OVS_LOG_INFO("Queue: %p, numElems: %d", @@ -409,8 +409,8 @@ unlock: * -------------------------------------------------------------------------- */ NTSTATUS -OvsRemoveEventEntry(POVS_OPEN_INSTANCE instance, - POVS_VPORT_EVENT_ENTRY entry) +OvsRemoveVportEventEntry(POVS_OPEN_INSTANCE instance, + POVS_VPORT_EVENT_ENTRY entry) { NTSTATUS status = STATUS_UNSUCCESSFUL; POVS_EVENT_QUEUE queue; @@ -427,7 +427,7 @@ OvsRemoveEventEntry(POVS_OPEN_INSTANCE instance, if (queue->numElems) { elem = (POVS_EVENT_QUEUE_ELEM)RemoveHeadList(&queue->elemList); - *entry = elem->event; + *entry = elem->vportEvent; OvsFreeMemoryWithTag(elem, OVS_EVENT_POOL_TAG); queue->numElems--; status = STATUS_SUCCESS; diff --git a/datapath-windows/ovsext/Event.h b/datapath-windows/ovsext/Event.h index fe03f0e..255594c 100644 --- a/datapath-windows/ovsext/Event.h +++ b/datapath-windows/ovsext/Event.h @@ -19,7 +19,7 @@ typedef struct _OVS_EVENT_QUEUE_ELEM { LIST_ENTRY link; - OVS_VPORT_EVENT_ENTRY event; + OVS_VPORT_EVENT_ENTRY vportEvent; } OVS_EVENT_QUEUE_ELEM, *POVS_EVENT_QUEUE_ELEM; typedef struct _OVS_EVENT_QUEUE { @@ -38,7 +38,7 @@ VOID OvsCleanupEventQueue(VOID); struct _OVS_OPEN_INSTANCE; VOID OvsCleanupEvent(struct _OVS_OPEN_INSTANCE *instance); -VOID OvsPostEvent(POVS_VPORT_EVENT_ENTRY event); +VOID OvsPostVportEvent(POVS_VPORT_EVENT_ENTRY event); NTSTATUS OvsSubscribeEventIoctl(PFILE_OBJECT fileObject, PVOID inputBuffer, UINT32 inputLength); NTSTATUS OvsPollEventIoctl(PFILE_OBJECT fileObject, PVOID inputBuffer, @@ -46,6 +46,7 @@ NTSTATUS OvsPollEventIoctl(PFILE_OBJECT fileObject, PVOID inputBuffer, UINT32 outputLength, UINT32 *replyLen); NTSTATUS OvsWaitEventIoctl(PIRP irp, PFILE_OBJECT fileObject, PVOID inputBuffer, UINT32 inputLength); -NTSTATUS OvsRemoveEventEntry(PVOID instance, POVS_VPORT_EVENT_ENTRY entry); +NTSTATUS OvsRemoveVportEventEntry(POVS_OPEN_INSTANCE instance, + POVS_VPORT_EVENT_ENTRY entry); #endif /* __EVENT_H_ */ diff --git a/datapath-windows/ovsext/Vport.c b/datapath-windows/ovsext/Vport.c index 534d76a..23e1e04 100644 --- a/datapath-windows/ovsext/Vport.c +++ b/datapath-windows/ovsext/Vport.c @@ -300,7 +300,7 @@ HvDeletePort(POVS_SWITCH_CONTEXT switchContext, RtlCopyMemory(&event.ovsName, &vport->ovsName, sizeof event.ovsName); event.type = OVS_EVENT_LINK_DOWN; OvsRemoveAndDeleteVport(NULL, switchContext, vport, TRUE, FALSE); - OvsPostEvent(&event); + OvsPostVportEvent(&event); } else { OVS_LOG_WARN("Vport not present."); } @@ -538,7 +538,7 @@ HvUpdateNic(POVS_SWITCH_CONTEXT switchContext, RtlCopyMemory(&evt.ovsName, &vport->ovsName, sizeof evt.ovsName); evt.type = OVS_EVENT_LINK_DOWN; OvsRemoveAndDeleteVport(NULL, switchContext, vport, FALSE, TRUE); - OvsPostEvent(&evt); + OvsPostVportEvent(&evt); } NdisReleaseRWLock(switchContext->dispatchLock, &lockState); @@ -609,7 +609,7 @@ HvDisconnectNic(POVS_SWITCH_CONTEXT switchContext, */ if (OvsIsRealExternalVport(vport)) { OvsRemoveAndDeleteVport(NULL, switchContext, vport, FALSE, TRUE); - OvsPostEvent(&event); + OvsPostVportEvent(&event); } NdisReleaseRWLock(switchContext->dispatchLock, &lockState);
Update the datapath to refer to events as vportEvents. This will aid in the introduction of other events. Signed-off-by: Sairam Venugopal <vsairam@vmware.com> --- datapath-windows/ovsext/Datapath.c | 3 ++- datapath-windows/ovsext/Event.c | 10 +++++----- datapath-windows/ovsext/Event.h | 7 ++++--- datapath-windows/ovsext/Vport.c | 6 +++--- 4 files changed, 14 insertions(+), 12 deletions(-)