Experimental Physics and
Industrial Control System

Diff comments:

> diff --git a/modules/libcom/src/log/logClient.c b/modules/libcom/src/log/logClient.c
> index 99ee671..b2c9acc 100644
> --- a/modules/libcom/src/log/logClient.c
> +++ b/modules/libcom/src/log/logClient.c
> @@ -21,11 +21,9 @@
>  #include <string.h>
>  #include <stdio.h>
>  
> -#define epicsExportSharedSymbols

In that case I had misunderstood how epicsExport.h is supposed to work. Not that I understand more now. Windows linking remains a mystery to me.

>  #include "dbDefs.h"
>  #include "epicsEvent.h"
>  #include "iocLog.h"
> -#include "errlog.h"
>  #include "epicsMutex.h"
>  #include "epicsThread.h"
>  #include "epicsTime.h"
> diff --git a/modules/libcom/src/osi/Makefile b/modules/libcom/src/osi/Makefile
> index ecbf4c2..3028baf 100644
> --- a/modules/libcom/src/osi/Makefile
> +++ b/modules/libcom/src/osi/Makefile
> @@ -86,6 +86,7 @@ endif
>  
>  Com_SRCS += osdSock.c
>  Com_SRCS += osdSockAddrReuse.cpp
> +Com_SRCS += osdSockCountUnsentBytes.c

The set of existing osdSock.c files (posix, WIN32, vxWorks) does not quite match the list of systems that have this feature (Linux, WIN32, Mac). How to do this best? Do I have to copy the posix version into the Linux version and add the new function to it and a dummy, always failing version to posix? What about default? What about Apple products? Do I have to add it to iOC and Darwin?

About the name: epicsSocketUnsentCount sounds fine to me. I had adopted the long, descriptive style of exiting function names in an attempt to fit in: epicsSocketSystemCallInterruptMechanismQueryInfo(), epicsSocketEnableAddressReuseDuringTimeWaitState(), epicsSocketEnableAddressUseForDatagramFanout()

>  Com_SRCS += osiSock.c
>  Com_SRCS += systemCallIntMech.cpp
>  Com_SRCS += epicsSocketConvertErrnoToString.cpp


-- 
https://code.launchpad.net/~dirk.zimoch/epics-base/+git/epics-base/+merge/372925
Your team EPICS Core Developers is subscribed to branch epics-base:7.0.

References:

[Merge] ~dirk.zimoch/epics-base:iocLogClientFixesTry2 into epics-base:7.0 Dirk Zimoch via Core-talk

Navigate by Date:

Prev: Build failed: epics-base base-7.0-301 AppVeyor via Core-talk

Next: Re: [Merge] ~dirk.zimoch/epics-base:iocLogClientFixesTry2 into epics-base:7.0 Dirk Zimoch via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  <2019>  2020  2021  2022  2023  2024 

Navigate by Thread:

Prev: Re: [Merge] ~dirk.zimoch/epics-base:iocLogClientFixesTry2 into epics-base:7.0 Dirk Zimoch via Core-talk

Next: Re: [Merge] ~dirk.zimoch/epics-base:iocLogClientFixesTry2 into epics-base:7.0 mdavidsaver via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  <2019>  2020  2021  2022  2023  2024