From: Jeffrey Altman Date: Tue, 4 Jul 2006 22:22:35 +0000 (+0000) Subject: ubik-call-sucks-20060704 X-Git-Tag: BP-openafs-windows-kdfs-ifs~1213 X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=941ac04165a9239a11b4ab908350dbfae24edfb9 ubik-call-sucks-20060704 make ubik_Call removal work on Windows. ==================== This delta was composed from multiple commits as part of the CVS->Git migration. The checkin message with each commit was inconsistent. The following are the additional commit messages. ==================== another fix for Windows --- diff --git a/src/NTMakefile b/src/NTMakefile index 9973481..4896cfc 100644 --- a/src/NTMakefile +++ b/src/NTMakefile @@ -137,7 +137,14 @@ rx: des $(NTMAKE) $(CD) ..\.. -rxstat: rx +ubik_headers: rx + echo ***** $@ + $(DOCD) $(SRC)\ubik + $(CD) $(SRC)\ubik + $(NTMAKE_HEADERS) + $(CD) ..\.. + +rxstat: ubik_headers echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile index 07ac222..a161450 100644 --- a/src/WINNT/afsd/NTMakefile +++ b/src/WINNT/afsd/NTMakefile @@ -232,8 +232,6 @@ LOGON_DLLOBJS =\ LOGON_DLLLIBS =\ $(DESTDIR)\lib\afsauthent.lib \ $(DESTDIR)\lib\libafsconf.lib \ - $(DESTDIR)\lib\afsrxkad.lib \ - $(DESTDIR)\lib\afsdes.lib \ $(LANAHELPERLIB) \ $(AFSKFWLIB) diff --git a/src/bozo/NTMakefile b/src/bozo/NTMakefile index 22830f3..a3929a1 100644 --- a/src/bozo/NTMakefile +++ b/src/bozo/NTMakefile @@ -118,9 +118,17 @@ $(CL_BOS_EXEFILE): $(RS_BOS_EXEFILE) ############################################################################ # Definitions for generating files via RXGEN -bosint.h bosint.cs.c bosint.ss.c bosint.xdr.c: bosint.xg - $(RXGEN) -x $** +bosint.cs.c: bosint.xg bosint.h + $(RXGEN) -x -C -o $@ bosint.xg +bosint.ss.c: bosint.xg bosint.h + $(RXGEN) -x -S -o $@ bosint.xg + +bosint.xdr.c: bosint.xg bosint.h + $(RXGEN) -x -c -o $@ bosint.xg + +bosint.h: bosint.xg + $(RXGEN) -x -h -o $@ bosint.xg ############################################################################ # Definitions for generating files via COMPILE_ET diff --git a/src/bubasics/NTMakefile b/src/bubasics/NTMakefile index a296ad0..de5f59f 100644 --- a/src/bubasics/NTMakefile +++ b/src/bubasics/NTMakefile @@ -46,12 +46,29 @@ $(LIBFILE): $(LIBOBJS) ############################################################################ # rxgen on butc.xg and bumon.xg -butc.h butc.xdr.c butc.ss.c butc.cs.c: butc.xg - $(RXGEN) $** +butc.xdr.c: butc.xg butc.h + $(RXGEN) -c -o $@ butc.xg -bumon.h bumon.xdr.c bumon.ss.c bumon.cs.c: bumon.xg - $(RXGEN) $** +butc.ss.c: butc.xg butc.h + $(RXGEN) -S -o $@ butc.xg +butc.cs.c: butc.xg butc.h + $(RXGEN) -C -o $@ butc.xg + +butc.h: butc.xg + $(RXGEN) -h -o $@ butc.xg + +bumon.xdr.c: bumon.xg bumon.h + $(RXGEN) -c -o $@ bumon.xg + +bumon.ss.c: bumon.xg bumon.h + $(RXGEN) -S -o $@ bumon.xg + +bumon.cs.c: bumon.xg bumon.h + $(RXGEN) -C -o $@ bumon.xg + +bumon.h: bumon.xg + $(RXGEN) -h -o $@ bumon.xg ############################################################################ # compile_et on butm_errs.et and butc_errs.et diff --git a/src/budb/NTMakefile b/src/budb/NTMakefile index d772cdf..8efabb4 100644 --- a/src/budb/NTMakefile +++ b/src/budb/NTMakefile @@ -92,8 +92,20 @@ $(OUT)\buserver.res: AFS_component_version_number.h ############################################################################ # rxgen budb.rg -budb.xdr.c budb.cs.c budb.ss.c $(INCFILEDIR)\budb.h: budb.rg - $(RXGEN) $** + +budb.cs.c: budb.rg budb.h + $(RXGEN) -u -C -o $@ budb.rg + +budb.ss.c: budb.rg budb.h + $(RXGEN) -S -o $@ budb.rg + +budb.xdr.c: budb.rg budb.h + $(RXGEN) -c -o $@ budb.rg + +budb.h: budb.rg + $(RXGEN) -u -h -o budb.h budb.rg + +$(INCFILEDIR)\budb.h: budb.h $(COPY) budb.h $(INCFILEDIR)\budb.h ############################################################################ diff --git a/src/fsint/NTMakefile b/src/fsint/NTMakefile index 96901d4..a6954d5 100644 --- a/src/fsint/NTMakefile +++ b/src/fsint/NTMakefile @@ -37,11 +37,30 @@ $(LIBFILE): $(LIBOBJS) $(LIBARCH) # use rxgen on afscbint.xg and afsint.xg -afscbint.cs.c afscbint.ss.c afscbint.xdr.c afscbint.h : afscbint.xg common.xg - $(RXGEN) -x -y afscbint.xg +afscbint.cs.c: common.xg afscbint.xg afsint.h afscbint.h + $(RXGEN) -x -C -o afscbint.cs.c afscbint.xg + +afscbint.ss.c: common.xg afscbint.xg afsint.h afscbint.h + $(RXGEN) -x -S -o afscbint.ss.c afscbint.xg + +afscbint.xdr.c: common.xg afscbint.xg afsint.h afscbint.h + $(RXGEN) -x -y -c -o afscbint.xdr.c afscbint.xg + +afscbint.h: common.xg afscbint.xg + $(RXGEN) -x -h -o afscbint.h afscbint.xg + +afsint.cs.c: common.xg afsint.xg afsint.h + $(RXGEN) -x -C -o afsint.cs.c afsint.xg + +afsint.ss.c: common.xg afsint.xg afsint.h + $(RXGEN) -x -S -o afsint.ss.c afsint.xg + +afsint.xdr.c: common.xg afsint.xg + $(RXGEN) -x -c -o afsint.xdr.c afsint.xg + +afsint.h: common.xg afsint.xg + $(RXGEN) -x -h -o afsint.h afsint.xg -afsint.cs.c afsint.ss.c afsint.xdr.c afsint.h: afsint.xg common.xg - $(RXGEN) -x afsint.xg # mtafsint.lib diff --git a/src/kauth/NTMakefile b/src/kauth/NTMakefile index 945674b..5696c15 100644 --- a/src/kauth/NTMakefile +++ b/src/kauth/NTMakefile @@ -198,8 +198,17 @@ $(INCFILES):$$(@F) ############################################################################ # rxgen on kauth.rg -kauth.ss.c kauth.cs.c kauth.xdr.c kauth.h: kauth.rg - $(RXGEN) -x $** +kauth.cs.c: kauth.rg kauth.h + $(RXGEN) -u -x -C -o $@ kauth.rg + +kauth.ss.c: kauth.rg kauth.h + $(RXGEN) -x -S -o $@ kauth.rg + +kauth.xdr.c: kauth.rg kauth.h + $(RXGEN) -x -c -o $@ kauth.rg + +kauth.h: kauth.rg + $(RXGEN) -u -x -h -o $@ kauth.rg ############################################################################ # compile_et on kaerrors.c diff --git a/src/libadmin/kas/NTMakefile b/src/libadmin/kas/NTMakefile index 4ee79ca..7af8c27 100644 --- a/src/libadmin/kas/NTMakefile +++ b/src/libadmin/kas/NTMakefile @@ -35,7 +35,8 @@ DLLLIBS =\ $(DESTDIR)\lib\afs\afsadminutil.lib \ $(DESTDIR)\lib\afsauthent.lib \ $(DESTDIR)\lib\afsrpc.lib \ - $(DESTDIR)\lib\afspthread.lib + $(DESTDIR)\lib\afspthread.lib \ + $(DESTDIR)\lib\afs\afsutil.lib $(DLLFILE): $(DLLOBJS) $(DLLLIBS) $(DLLCONLINK) /DEF:kasadmin.def diff --git a/src/libadmin/pts/NTMakefile b/src/libadmin/pts/NTMakefile index d8765db..15883fc 100644 --- a/src/libadmin/pts/NTMakefile +++ b/src/libadmin/pts/NTMakefile @@ -38,7 +38,8 @@ DLLLIBS =\ $(DESTDIR)\lib\afs\afsadminutil.lib \ $(DESTDIR)\lib\afsauthent.lib \ $(DESTDIR)\lib\afsrpc.lib \ - $(DESTDIR)\lib\afspthread.lib + $(DESTDIR)\lib\afspthread.lib \ + $(DESTDIR)\lib\afs\afsutil.lib $(DLLFILE): $(DLLOBJS) $(DLLLIBS) $(DLLCONLINK) /DEF:ptsadmin.def diff --git a/src/libadmin/vos/NTMakefile b/src/libadmin/vos/NTMakefile index 0d6ec63..db91912 100644 --- a/src/libadmin/vos/NTMakefile +++ b/src/libadmin/vos/NTMakefile @@ -59,7 +59,8 @@ DLLLIBS =\ $(DESTDIR)\lib\afspthread.lib \ $(DESTDIR)\lib\afs\afsadminutil.lib \ $(DESTDIR)\lib\afsauthent.lib \ - $(DESTDIR)\lib\afsrpc.lib + $(DESTDIR)\lib\afsrpc.lib \ + $(DESTDIR)\lib\afs\afsutil.lib $(DLLFILE): $(DLLOBJS) $(DLLLIBS) $(DLLCONLINK) /DEF:vosadmin.def diff --git a/src/libafsauthent/afsauthent.def b/src/libafsauthent/afsauthent.def index 687621e..d7dba37 100644 --- a/src/libafsauthent/afsauthent.def +++ b/src/libafsauthent/afsauthent.def @@ -112,16 +112,5 @@ EXPORTS ka_KeyCheckSum @110 rx_Finalize @111 rx_InitHost @112 - - - - - - - - - - - - - + VOTE_GetSyncSite @113 + ubik_RefreshConn @114 diff --git a/src/libafsrpc/NTMakefile b/src/libafsrpc/NTMakefile index 21a05bd..13c614a 100644 --- a/src/libafsrpc/NTMakefile +++ b/src/libafsrpc/NTMakefile @@ -30,7 +30,7 @@ XDROBJS = $(OUT)\xdr.obj $(OUT)\xdr_array.obj $(OUT)\xdr_arrayn.obj $(OUT)\xdr_f $(OUT)\xdr_rec.obj $(OUT)\xdr_refernce.obj $(OUT)\xdr_rx.obj $(OUT)\xdr_update.obj \ $(OUT)\xdr_afsuuid.obj $(OUT)\xdr_int64.obj $(OUT)\xdr_int32.obj -RXOBJS = $(OUT)\rx_event.obj $(OUT)\rx_user.obj $(OUT)\rx_pthread.obj $(OUT)\rx.obj \ +RXOBJS = $(OUT)\rx_event.obj $(OUT)\rx_user.obj $(OUT)\rx_pthread.obj $(OUT)\rx.obj $(OUT)\rx_clock_nt.obj \ $(OUT)\rx_null.obj $(OUT)\rx_globals.obj $(OUT)\rx_getaddr.obj $(OUT)\rx_misc.obj $(OUT)\rx_packet.obj \ $(OUT)\rx_rdwr.obj $(OUT)\rx_trace.obj $(OUT)\rx_xmit_nt.obj $(OUT)\rx_conncache.obj diff --git a/src/ptserver/NTMakefile b/src/ptserver/NTMakefile index 4d87ca6..a39461f 100644 --- a/src/ptserver/NTMakefile +++ b/src/ptserver/NTMakefile @@ -10,6 +10,7 @@ RELDIR=ptserver !INCLUDE ..\config\NTMakefile.$(SYS_NAME) !include ..\config\NTMakefile.version +AFSDEV_AUXCDEFINES = -DAFS_USE_GETTIMEOFDAY ############################################################################ # Definitions for installing header files @@ -137,8 +138,17 @@ $(OUT)\ptclient.res: AFS_component_version_number.h $(INCFILEDIR)\afs\ptint.h : ptint.h -ptint.ss.c ptint.cs.c ptint.xdr.c ptint.h: ptint.xg - $(RXGEN) -x $** +ptint.cs.c: ptint.xg ptint.h + $(RXGEN) -x -C -u -o $@ ptint.xg + +ptint.ss.c: ptint.xg ptint.h + $(RXGEN) -x -S -o $@ ptint.xg + +ptint.xdr.c: ptint.xg ptint.h + $(RXGEN) -x -c -o $@ ptint.xg + +ptint.h: ptint.xg + $(RXGEN) -x -h -u -o $@ ptint.xg ############################################################################ # Definitions for generating files via COMPILE_ET diff --git a/src/ptserver/ptclient.c b/src/ptserver/ptclient.c index 2b2a097..332b8ed 100644 --- a/src/ptserver/ptclient.c +++ b/src/ptserver/ptclient.c @@ -171,7 +171,7 @@ main(argc, argv) register afs_int32 code; char op[8]; char name[PR_MAXNAMELEN]; - afs_int32 id, oid, gid; + afs_int32 id, oid = ANONYMOUSID, gid; afs_int32 pos; int i; struct prentry entry; @@ -539,7 +539,7 @@ main(argc, argv) if (GetString(name, sizeof(name))) code = PRBADARG; else - code = ubik_PR_NewEntry(pruclient, 0, name, 1, &id); + code = ubik_PR_NewEntry(pruclient, 0, name, 1, oid, &id); if (CodeOk(code)) printf("%s\n", pr_ErrorMsg(code)); if (code == PRSUCCESS) diff --git a/src/rx/rx_clock_nt.c b/src/rx/rx_clock_nt.c index 96bf81e..beb188c 100644 --- a/src/rx/rx_clock_nt.c +++ b/src/rx/rx_clock_nt.c @@ -23,15 +23,14 @@ RCSID #include #include "rx_clock.h" -void clock_UpdateTime(void); /* forward reference */ - struct clock clock_now; /* The last elapsed time ready by clock_GetTimer */ /* This is set to 1 whenever the time is read, and reset to 0 whenever * clock_NewTime is called. This is to allow the caller to control the * frequency with which the actual time is re-evaluated. */ -int clock_haveCurrentTime; +#undef clock_haveCurrentTime +int clock_haveCurrentTime = 0; int clock_nUpdates; /* The actual number of clock updates */ static int clockInitialized = 0; @@ -43,6 +42,7 @@ LARGE_INTEGER rxi_clockFreq; #undef clock_UpdateTime void clock_UpdateTime(void); +#undef clock_Init void clock_Init(void) { diff --git a/src/rx/rx_globals.c b/src/rx/rx_globals.c index 437a1a5..70fa044 100644 --- a/src/rx/rx_globals.c +++ b/src/rx/rx_globals.c @@ -32,8 +32,10 @@ RCSID #define INIT(stuff) = stuff #if defined(AFS_NT40_ENV) && defined(AFS_PTHREAD_ENV) #define EXT __declspec(dllexport) +#define EXT2 __declspec(dllexport) #else #define EXT +#define EXT2 #endif #ifdef KERNEL diff --git a/src/rx/rx_globals.h b/src/rx/rx_globals.h index f3dfddc..0f329e3 100644 --- a/src/rx/rx_globals.h +++ b/src/rx/rx_globals.h @@ -21,11 +21,17 @@ #ifndef INIT #define INIT(x) -#if defined(AFS_NT40_ENV) && defined(AFS_PTHREAD_ENV) +#if defined(AFS_NT40_ENV) +#if defined(AFS_PTHREAD_ENV) #define EXT __declspec(dllimport) extern #else #define EXT extern #endif +#define EXT2 __declspec(dllimport) extern +#else +#define EXT2 extern +#define EXT extern +#endif #endif /* !INIT */ /* Basic socket for client requests; other sockets (for receiving server requests) are in the service structures */ @@ -571,7 +577,7 @@ EXT int rxi_pthread_hinum INIT(0); EXT afs_kmutex_t rx_stats_mutex; /* used to activate stats gathering */ #endif -EXT int rx_enable_stats INIT(0); +EXT2 int rx_enable_stats INIT(0); /* * Set this flag to enable the listener thread to trade places with an idle diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c index 5319438..fafc81b 100644 --- a/src/rxgen/rpc_parse.c +++ b/src/rxgen/rpc_parse.c @@ -1812,7 +1812,10 @@ ucs_ProcTail_setup(definition * defp, int split_flag) proc1_list *plist; f_print(fout, "{\tafs_int32 rcode, code, newHost, thisHost, i, _ucount;\n"); - f_print(fout, "\tint chaseCount, pass, needsync, inlist, j;\n"); + f_print(fout, "\tint chaseCount, pass, needsync, inlist;\n"); +#if 0 /* goes with block below */ + f_print(fout, "\tint j;\n"); +#endif f_print(fout, "\tstruct rx_connection *tc;\n"); f_print(fout, "\tstruct rx_peer *rxp;\n"); f_print(fout, "\tshort origLevel;\n\n"); diff --git a/src/rxstat/NTMakefile b/src/rxstat/NTMakefile index 2bd6da1..9f04932 100644 --- a/src/rxstat/NTMakefile +++ b/src/rxstat/NTMakefile @@ -31,8 +31,17 @@ LIBFILE = $(DESTDIR)\lib\afsrxstat.lib $(LIBFILE): $(LIBOBJS) $(LIBARCH) -rxstat.cs.c rxstat.ss.c rxstat.xdr.c rxstat.h: rxstat.xg - $(RXGEN) -x $** +rxstat.cs.c: rxstat.xg rxstat.h + $(RXGEN) -x -C -o $@ rxstat.xg + +rxstat.ss.c: rxstat.xg rxstat.h + $(RXGEN) -x -S -o $@ rxstat.xg + +rxstat.xdr.c: rxstat.xg rxstat.h + $(RXGEN) -x -c -o $@ rxstat.xg + +rxstat.h: rxstat.xg + $(RXGEN) -x -h -o $@ rxstat.xg copyheader: rxstat.h $(COPY) rxstat.h $(INCFILEDIR)\rx\rxstat.h diff --git a/src/tviced/NTMakefile b/src/tviced/NTMakefile index 4fbc7e0..f68f4e7 100644 --- a/src/tviced/NTMakefile +++ b/src/tviced/NTMakefile @@ -88,6 +88,7 @@ $(FSINTOBJS): $(FSINT)\$$(@B).C EXELIBS = \ $(DESTDIR)\lib\afsauthent.lib \ + $(DESTDIR)\lib\afs\afsprot.lib \ $(DESTDIR)\lib\afsrpc.lib \ $(DESTDIR)\lib\afs\afscmd.lib \ $(DESTDIR)\lib\afs\afsaudit.lib \ diff --git a/src/ubik/NTMakefile b/src/ubik/NTMakefile index 14d916a..51f9073 100644 --- a/src/ubik/NTMakefile +++ b/src/ubik/NTMakefile @@ -18,7 +18,7 @@ INCFILES =\ $(INCFILEDIR)\ubik.h \ $(INCFILEDIR)\ubik_int.h - +install_headers: $(INCFILES) ############################################################################ # install afsubik.lib @@ -87,8 +87,17 @@ $(OUT)\udebug.res: AFS_component_version_number.h $(INCFILES):$$(@F) $(COPY) $** $(INCFILEDIR)\. -ubik_int.ss.c ubik_int.cs.c ubik_int.xdr.c ubik_int.h: ubik_int.xg - $(RXGEN) -x $** +ubik_int.cs.c: ubik_int.xg ubik_int.h + $(RXGEN) -x -C -o $@ ubik_int.xg + +ubik_int.ss.c: ubik_int.xg ubik_int.h + $(RXGEN) -x -S -o $@ ubik_int.xg + +ubik_int.xdr.c: ubik_int.xg ubik_int.h + $(RXGEN) -x -c -o $@ ubik_int.xg + +ubik_int.h: ubik_int.xg + $(RXGEN) -x -h -o $@ ubik_int.xg ############################################################################ # compile_et on uerrors.et diff --git a/src/update/NTMakefile b/src/update/NTMakefile index f66c21f..c1cd074 100644 --- a/src/update/NTMakefile +++ b/src/update/NTMakefile @@ -27,8 +27,17 @@ LIBS = \ ############################################################################ # Definitions for generating files via RXGEN -update.cs.c update.ss.c update.er.c update.h: update.xg - $(RXGEN) $** +update.cs.c: update.xg update.h + $(RXGEN) -u -C -o $@ update.xg + +update.ss.c: update.xg update.h + $(RXGEN) -S -o $@ update.xg + +update.xdr.c: update.xg update.h + $(RXGEN) -c -o $@ update.xg + +update.h: update.xg + $(RXGEN) -u -h -o $@ update.xg ############################################################################ # upserver diff --git a/src/vlserver/NTMakefile b/src/vlserver/NTMakefile index fb1a9cb..c6c6668 100644 --- a/src/vlserver/NTMakefile +++ b/src/vlserver/NTMakefile @@ -104,8 +104,17 @@ $(OUT)\vlserver.res: AFS_component_version_number.h $(INCFILES):$$(@F) $(COPY) $** $(INCFILEDIR)\. -vldbint.ss.c vldbint.cs.c vldbint.xdr.c vldbint.h: vldbint.xg - $(RXGEN) -x $** +vldbint.cs.c: vldbint.xg vldbint.h + $(RXGEN) -u -x -C -o $@ vldbint.xg + +vldbint.ss.c: vldbint.xg vldbint.h + $(RXGEN) -x -S -o $@ vldbint.xg + +vldbint.xdr.c: vldbint.xg vldbint.h + $(RXGEN) -x -c -o $@ vldbint.xg + +vldbint.h: vldbint.xg + $(RXGEN) -u -x -h -o $@ vldbint.xg $(COPY) vldbint.h $(DESTDIR)\include\afs\vldbint.h ############################################################################ diff --git a/src/volser/NTMakefile b/src/volser/NTMakefile index ded4d73..fade17a 100644 --- a/src/volser/NTMakefile +++ b/src/volser/NTMakefile @@ -140,9 +140,17 @@ $(OUT)\vos.res: AFS_component_version_number.h $(INCFILES):$$(@F) $(COPY) $** $(INCFILEDIR)\. -volint.h volint.cs.c volint.ss.c volint.xdr.c: volint.xg - $(RXGEN) -x $** +volint.cs.c: volint.xg volint.h + $(RXGEN) -x -C -o $@ volint.xg +volint.ss.c: volint.xg volint.h + $(RXGEN) -x -S -o $@ volint.xg + +volint.xdr.c: volint.xg volint.h + $(RXGEN) -x -c -o $@ volint.xg + +volint.h: volint.xg + $(RXGEN) -x -h -o $@ volint.xg ############################################################################ # Definitions for generating files via COMPILE_ET