Attachment #72077 for bug #80219

Lines 56-62 Link Here

(-)distcc-2.18.3/Makefile.in (-4 / +16 lines)
56	GNOME_CFLAGS = @GNOME_CFLAGS@	56	GNOME_CFLAGS = @GNOME_CFLAGS@
57	GNOME_LIBS = @GNOME_LIBS@	57	GNOME_LIBS = @GNOME_LIBS@
58		58
59	LIBS = @LIBS@	59	LIBS = @LIBS@ @LIB_SLP@
60		60
61	DESTDIR =	61	DESTDIR =
62		62
Lines 78-83 Link Here
78	$(MEN) \	78	$(MEN) \
79	$(pkgdoc_DOCS) \	79	$(pkgdoc_DOCS) \
80	$(example_DOCS) \	80	$(example_DOCS) \
		81	$(slp_EXTRA) $(slp_SRC) $(slp_HEADERS) \
81	$(popt_EXTRA) $(popt_SRC) $(popt_HEADERS) \	82	$(popt_EXTRA) $(popt_SRC) $(popt_HEADERS) \
82	$(SRC) $(HEADERS) \	83	$(SRC) $(HEADERS) \
83	$(test_SOURCE) \	84	$(test_SOURCE) \
Lines 170-175 Link Here
170	src/safeguard.o src/snprintf.o src/timeval.o \	171	src/safeguard.o src/snprintf.o src/timeval.o \
171	lzo/minilzo.o	172	lzo/minilzo.o
172		173
		174	distccenv_obj = src/distccenv.o src/cc_version.o
		175
173	distcc_obj = src/backoff.o \	176	distcc_obj = src/backoff.o \
174	src/climasq.o src/clinet.o src/clirpc.o \	177	src/climasq.o src/clinet.o src/clirpc.o \
175	src/compile.o src/cpp.o \	178	src/compile.o src/cpp.o \
Lines 187-193 Link Here
187	src/ncpus.o \	190	src/ncpus.o \
188	src/prefork.o \	191	src/prefork.o \
189	src/serve.o src/setuid.o src/srvnet.o src/srvrpc.o src/state.o \	192	src/serve.o src/setuid.o src/srvnet.o src/srvrpc.o src/state.o \
190	$(common_obj) @BUILD_POPT@	193	$(common_obj) @BUILD_POPT@ @BUILD_SLP@
191		194
192	# Objects that need to be linked in to build monitors	195	# Objects that need to be linked in to build monitors
193	mon_obj = \	196	mon_obj = \
Lines 221-227 Link Here
221	src/cleanup.c \	224	src/cleanup.c \
222	src/climasq.c src/clinet.c src/clirpc.c src/compile.c \	225	src/climasq.c src/clinet.c src/clirpc.c src/compile.c \
223	src/compress.c src/cpp.c \	226	src/compress.c src/cpp.c \
224	src/daemon.c src/distcc.c src/dsignal.c \	227	src/daemon.c src/distcc.c src/dsignal.c src/register_slp.c \
225	src/dopt.c src/dparent.c src/exec.c src/filename.c \	228	src/dopt.c src/dparent.c src/exec.c src/filename.c \
226	src/h_argvtostr.c \	229	src/h_argvtostr.c \
227	src/h_exten.c src/h_hosts.c src/h_issource.c src/h_parsemask.c \	230	src/h_exten.c src/h_hosts.c src/h_issource.c src/h_parsemask.c \
Lines 264-269 Link Here
264	gnome_data = gnome/distccmon-gnome-icon.png \	267	gnome_data = gnome/distccmon-gnome-icon.png \
265	gnome/distccmon-gnome.desktop	268	gnome/distccmon-gnome.desktop
266		269
		270	slp_OBJS=src/register_slp.o src/cc_version.o
		271	slp_SRC=src/register_slp.c src/cc_version.c
		272	slp_HEADERS = src/register_slp.h src/cc_version.h
		273	slp_EXTRA = README.slp
		274
267	popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \	275	popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
268	popt/popthelp.o popt/poptparse.o	276	popt/popthelp.o popt/poptparse.o
269		277
Lines 291-297 Link Here
291	distcc@EXEEXT@ \	299	distcc@EXEEXT@ \
292	distccd@EXEEXT@ \	300	distccd@EXEEXT@ \
293	distccmon-text@EXEEXT@ \	301	distccmon-text@EXEEXT@ \
294	@GNOME_BIN@	302	@GNOME_BIN@ \
		303	@SLP_BIN@
295		304
296	check_PROGRAMS = \	305	check_PROGRAMS = \
297	h_argvtostr@EXEEXT@ \	306	h_argvtostr@EXEEXT@ \
Lines 333-338 Link Here
333	distcc@EXEEXT@: $(distcc_obj)	342	distcc@EXEEXT@: $(distcc_obj)
334	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(distcc_obj) $(LIBS)	343	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(distcc_obj) $(LIBS)
335		344
		345	distccenv@EXEEXT@: $(distccenv_obj)
		346	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(distccenv_obj) $(LIBS)
		347
336	distccd@EXEEXT@: $(distccd_obj)	348	distccd@EXEEXT@: $(distccd_obj)
337	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(distccd_obj) $(LIBS)	349	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(distccd_obj) $(LIBS)
338		350




#
# SLP support in distcc
#

It is enough to start the SLP server and distcc server, if you have 
compiled distccd with SLP support. You can simply use distcc as compiler
afterwards.

NOTE: SLP support is only used, when distccd runs as daemon, not when
      running via inetd or xinetd !

The distcc frontend cache SLP results inside the $HOME/.distcc.slp.cache
file. This file gets update every 3 minutes (hardcoded for now).

Alternative you can set the enviroment once via distccenv. A bash user
might simply do to set $DISTCC_HOSTS with

  eval `distccenv`

A distcc service url looks like

 service:distccd.$IDENTITY

The identity is usually set based on the used compiler at build time 
of distcc and the used system architecture.
However there is no check which checks the installed compiler, since it
is not known how it is called at distccd startup time.

You can set the IDENTITY during distccd startup via the --slp-identy=$IDENTITY
switch. You need to set the $DISTCC_IDENTITY enviroment variable to the
same value afterwards inside your enviroment (or during distccenv run).

There is some very basic load balancing code. You can enable it via

  export DISTCC_LOAD_BALANCE=1

in your compile enviroment. It is not active, if $DISTCC_HOSTS is set.

Have fun, adrian.





# include <unistd.h>
#endif"

ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os docdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT GNOME_PACKAGES GNOME_CFLAGS GNOME_LIBS INSTALL_GNOME SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PYTHON CPP EGREP LIB_SLP BUILD_POPT GNOME_BIN SLP_BIN BUILD_SLP LIBOBJS LTLIBOBJS'
ac_subst_files=''

# Initialize some variables set by options.

  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
  --enable-rfc2553        use getaddrinfo, getnameinfo, etc
  --enable-profile        turn on gprof
  --enable-slp            find hosts via slp

Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

    else
      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
    fi
    cd $ac_popdir
  done
fi


  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

fi;



# Check whether --with-gnome or --without-gnome was given.
if test "${with_gnome+set}" = set; then
  withval="$with_gnome"

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

echo "${ECHO_T}no" >&6
fi

########################################################################
# Check for OpenSLP
# Check whether --enable-slp or --disable-slp was given.
if test "${enable_slp+set}" = set; then
  enableval="$enable_slp"
  with_slp=$enableval
else
  with_slp=no
fi;
if test "$with_slp" = "yes"; then
echo "$as_me:$LINENO: checking for SLP support" >&5
echo $ECHO_N "checking for SLP support... $ECHO_C" >&6
save_slptest_LIBS="$LIBS"
save_slptest_LDFLAGS="$LDFLAGS"
save_slptest_CPPFLAGS="$CPPFLAGS"
LDFLAGS="$all_libraries $LDFLAGS"
CPPFLAGS="$CPPFLAGS $all_includes"
LIBS="-lslp"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */

                       #include <slp.h>

int
main ()
{

                       SLPOpen(0, SLP_FALSE, (SLPHandle*) 0);

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  (eval $ac_link) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest$ac_exeext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then


cat >>confdefs.h <<\_ACEOF
#define WITH_SLP 1
_ACEOF

                       LIB_SLP="-lslp"
		       SLP_BIN=distccenv
                       BUILD_SLP='$(slp_OBJS)'
                       echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6

else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5


                       { { echo "$as_me:$LINENO: error: no" >&5
echo "$as_me: error: no" >&2;}
   { (exit 1); exit 1; }; }

fi
rm -f conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
CPPFLAGS=$save_slptest_CPPFLAGS
LDFLAGS=$save_slptest_LDFLAGS
LIBS=$save_slptest_LIBS
fi




########################################################################

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?





########################################################################
# Checks for library functions, using libraries discovered above
CPPFLAGS="$CPPFLAGS -I$srcdir/src"

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?






cat >>confdefs.h <<_ACEOF
#define GNU_HOST "$host"
_ACEOF

s,@PYTHON@,$PYTHON,;t t
s,@CPP@,$CPP,;t t
s,@EGREP@,$EGREP,;t t
s,@LIB_SLP@,$LIB_SLP,;t t
s,@BUILD_POPT@,$BUILD_POPT,;t t
s,@GNOME_BIN@,$GNOME_BIN,;t t
s,@SLP_BIN@,$SLP_BIN,;t t
s,@BUILD_SLP@,$BUILD_SLP,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF

  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
  esac

  if test x"$ac_file" != x-; then
    { echo "$as_me:$LINENO: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
    rm -f "$ac_file"
  fi
  # Let's still pretend it is `configure' which instantiates (i.e., don't
  # use $as_me), people would be surprised to read:
  #    /* config.h.  Generated by config.status.  */

	 fi;;
      esac
    done` || { (exit 1); exit 1; }

  if test x"$ac_file" != x-; then
    { echo "$as_me:$LINENO: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
    rm -f "$ac_file"
  fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
  sed "$ac_vpsub




	AC_HELP_STRING([--enable-rfc2553], [use getaddrinfo, getnameinfo, etc]),
        AC_DEFINE(ENABLE_RFC2553,1,[Use getaddrinfo(), getnameinfo(), etc]))


AC_ARG_WITH(gnome,
        AC_HELP_STRING([--with-gnome], [build GNOME-based monitor]))


    AC_MSG_RESULT(no)
fi

########################################################################
# Check for OpenSLP
AC_ARG_ENABLE(slp, [  --enable-slp            find hosts via slp],  with_slp=$enableval, with_slp=no)
if test "$with_slp" = "yes"; then
AC_MSG_CHECKING(for SLP support)
save_slptest_LIBS="$LIBS"
save_slptest_LDFLAGS="$LDFLAGS"
save_slptest_CPPFLAGS="$CPPFLAGS"
LDFLAGS="$all_libraries $LDFLAGS"
CPPFLAGS="$CPPFLAGS $all_includes"
LIBS="-lslp"
AC_TRY_LINK(   [
                       #include <slp.h>
               ],[
                       SLPOpen(0, SLP_FALSE, (SLPHandle*) 0);
               ],[
                       AC_DEFINE(WITH_SLP,1,[Define if SLP is avaible and enabled])
                       LIB_SLP="-lslp"
		       SLP_BIN=distccenv
                       BUILD_SLP='$(slp_OBJS)'
                       AC_MSG_RESULT(yes)
               ],[
                       AC_MSG_ERROR(no)
])
CPPFLAGS=$save_slptest_CPPFLAGS
LDFLAGS=$save_slptest_LDFLAGS
LIBS=$save_slptest_LIBS
fi
AC_SUBST(LIB_SLP)



########################################################################
# Check for types
AC_TYPE_SIGNAL


########################################################################
# Checks for library functions, using libraries discovered above
CPPFLAGS="$CPPFLAGS -I$srcdir/src"

AC_SUBST(CPPFLAGS)
AC_SUBST(BUILD_POPT)
AC_SUBST(GNOME_BIN)
AC_SUBST(SLP_BIN)
AC_SUBST(BUILD_SLP)
dnl AC_DEFINE_UNQUOTED(PACKAGE, $PACKAGE, [Package name])
dnl AC_DEFINE_UNQUOTED(VERSION, $VERSION, [Package version])
AC_DEFINE_UNQUOTED(GNU_HOST, ["$host"], [Your gnu-style host triple])




/* -*- c-file-style: "java"; indent-tabs-mode: nil -*-
 *
 * distcc -- A simple distributed compiler system
 *
 * Copyright (C) 2003 by Adrian Schroeter <adrian@suse.de>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 * USA
 */

#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <sys/utsname.h>
#include "cc_version.h"
#include "config.h"

char *used_compiler_version(void)
{
    char *compiler     = NULL;
    char *architecture = NULL;
    char *ret;
    int len;

    /* The enviroment is always right ... */
    if ( getenv("DISTCC_IDENTIFY") )
	return getenv("DISTCC_IDENTIFY"); 

    /* do we really want a runtime check here ? */
    /* it would be worse performance wise for the distcc frontend ... */

    /* default compiler based on distcc build time */
#ifdef __GNUC__
#ifdef __GNUC_MINOR__
#ifdef __GNUC_PATCHLEVEL__
    compiler = (char*) malloc( 33 );
    snprintf( compiler, 32, "gcc-%d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__ );
#endif
#endif
#endif

#ifdef GNU_HOST
    architecture = strdup(GNU_HOST);
    {
       char *p;
       p = strstr( architecture, "-" );
       if (p){
         *p = '\0';
         /* unify all different ia32 systems */
         p = architecture;
         if ( p[0] == 'i' && p[2] == '8' && p[3] == '6' && p[4] == '\0' )
           p[1] = '3';
       }
    }
#endif

    if ( compiler == NULL ){
       /* we use the system release, this is unreleated to the compiler
          version, but better than default ... */
       struct utsname t;
       if ( !uname( &t ) )
          compiler = t.release;
    }
    if ( architecture == NULL ){
       struct utsname t;
       if ( !uname( &t ) )
          architecture = t.machine;
    }

    /* fallback values */
    if ( compiler == NULL )
       compiler = strdup("default");
    if ( architecture == NULL )
       architecture = strdup("default");

    len = strlen(compiler) + 1 + strlen(architecture) + 1;
    ret = (char*) malloc(len + 1);
    snprintf( ret, len, "%s-%s", compiler, architecture );
    return ret;
}


Line 0 Link Here

(-)distcc-2.18.3/src/cc_version.h (+3 lines)
	1
	2	char *used_compiler_version(void);
	3

Lines 239-244 Link Here

(-)distcc-2.18.3/src/config.h.in (+3 lines)
239	/* Use GTK+ */	239	/* Use GTK+ */
240	#undef WITH_GTK	240	#undef WITH_GTK
241		241
		242	/* Use SLP */
		243	#undef WITH_SLP
		244
242	/* Define to `__inline__' or `__inline' if that's what the C compiler	245	/* Define to `__inline__' or `__inline' if that's what the C compiler
243	calls it, or to nothing if 'inline' is not supported under any name. */	246	calls it, or to nothing if 'inline' is not supported under any name. */
244	#ifndef __cplusplus	247	#ifndef __cplusplus





#include "config.h"

#ifndef WITH_SLP
#error distccenv needs SLP atm. 
#endif

#include <stdlib.h>
#include <stdio.h>
#include <string.h>

#include "register_slp.h"

#define BUFFER 1024

char compiler[BUFFER + 1];
FILE *out;

#define MAX_HOSTS 256
struct dcc_host{
  char *url;
  int  jobs;
  float speed;
  float load;
  long value;
};
struct dcc_host hosts[MAX_HOSTS];
int host_count = 0;

int slp_calls = 0;
int load_balancing = 0;

void dump_result(void);
SLPBoolean myAttrCallback(SLPHandle phslp, char* attrlist,
                          SLPError errcode, void* cookie );
SLPBoolean MySLPSrvURLCallback( SLPHandle phslp, const char* srvurl,
                              unsigned short lifetime, SLPError errcode,
                              void* cookie );

void dump_result(void)
{
  int h, j, max_jobs = 0;
  float avg_speed = 0, avg_load = 0;

  if ( host_count == 0 )
     exit(-1);

  if ( !out )
     printf( "DISTCC_HOSTS=\"" );

  if ( load_balancing )
  {
     for ( h = 0; h<host_count; h++ ){
        avg_speed += hosts[h].speed;
        avg_load  += hosts[h].load;
     }
     avg_speed /= host_count;
     avg_load /= host_count;
     
     for ( h = 0; h<host_count; h++ ){
        hosts[h].value = hosts[h].jobs
                         * ( hosts[h].speed / avg_speed );
#if 0
// load might be misleading, so we only care about bogomips atm
// beside of architectures with random bogomips values (like s390) 
// this should work so far now.
                         * ( avg_load / hosts[h].load );
#endif
        if ( max_jobs < hosts[h].value )
           max_jobs = hosts[h].value;
     }
  }

  for ( j = 0; j<(load_balancing?max_jobs:1); j++ ){
     for ( h = 0; h<host_count; h++ ){
        if ( !load_balancing || j < hosts[h].value ){
           if ( out ){
              fputs( hosts[h].url, out );
              fputs( "\n", out );
           }else{
              printf( "%s ", hosts[h].url );
           }
        }
     }
  }

  if ( out )
    fclose( out );
  else
    printf( "\"\n" );
  exit(0);
}

SLPBoolean myAttrCallback(SLPHandle phslp,
                        char* attrlist,
                        SLPError errcode,
                        void* cookie )
{
    phslp = phslp;
    struct dcc_host *_host = &(hosts[(long)cookie]);

    if(attrlist && errcode == SLP_OK)
    {
	char *p;

        p = strstr( attrlist, "(maxjobs=" );
	if ( p )
	   _host->jobs  = atoi( p + strlen("(maxjobs=") );

        p = strstr( attrlist, "(bogomips=" );
	if ( p )
	   _host->speed = atol( p + strlen("(bogomips=") );

        p = strstr( attrlist, "(load=" );
	if ( p )
	   _host->load  = atol( p + strlen("(load=") );
    }

    return SLP_FALSE;
}

SLPBoolean MySLPSrvURLCallback( SLPHandle phslp,
                              const char* srvurl,
                              unsigned short lifetime,
                              SLPError errcode,
                              void* cookie )
{
  phslp = phslp; lifetime = lifetime; cookie = cookie;

  if ( host_count >= MAX_HOSTS || !srvurl
       || strncmp( compiler, srvurl, strlen(compiler) ) ) 
     return SLP_TRUE;

  if(errcode == SLP_OK || errcode == SLP_LAST_CALL) 
  {
     hosts[host_count].url   = strdup((char*)(strlen(compiler) + srvurl + 3));
     hosts[host_count].jobs  = -1;
     hosts[host_count].speed = -1;
     host_count++;
  }

  return SLP_TRUE;
}

int main( int argc, char *argv[] )
{
  long h;
  SLPHandle phslp;
  SLPError result;
  char *p;

  out = 0;

  p = getenv("DISTCC_LOAD_BALANCE");
  if ( p && (!strcmp( "1", p)||!strncmp( "y", p, 1)) )
     load_balancing = 1;
 
  if ( argc > 2 && !strcmp(argv[1], "--file" ) )
     out = fopen( argv[2], "w" );

  snprintf( compiler, BUFFER, "service:distccd.%s", used_compiler_version() );

  result = SLPOpen( NULL, SLP_FALSE, &phslp);
  if (result != SLP_OK) {
     fprintf( stderr, "SLPOpen failed !   Aborting ... " );
     exit( -1 );
  } else {
     result = SLPFindSrvs( phslp,
                           compiler,
                           "", // TODO: Scope selector
                           "", // all services
                           MySLPSrvURLCallback,
                           0 );
     if (result != SLP_OK){
        fprintf( stderr, "unable to query for services !  Aborting .." );
        exit(-1);
     }

     if ( load_balancing )
     {
        for ( h = 0; h < host_count; h++ )
        {
           char buf[BUFFER+1];
           snprintf( buf, BUFFER, "%s://%s", compiler, hosts[h].url );
           result = SLPFindAttrs(phslp,
                                buf,
                                "",
                                "maxjobs,bogomips,load",
                                myAttrCallback,
                                (void*)h);
           if(result != SLP_OK)
           {
               printf("unable to request SLP attributes: %i\n",result);
               exit(-1);
           }
        }
     }else
        dump_result();

     SLPClose( phslp );
  }

  dump_result();
  return 0;
}

Lines 45-50 Link Here

(-)distcc-2.18.3/src/dopt.c (+17 lines)
45	#include "daemon.h"	45	#include "daemon.h"
46	#include "access.h"	46	#include "access.h"
47		47
		48	#ifdef WITH_SLP
		49	#include "register_slp.h"
		50	#endif
		51
48	int opt_niceness = 5; /* default */	52	int opt_niceness = 5; /* default */
49		53
50	/**	54	/**
Lines 85-90 Link Here
85		89
86	const char *arg_pid_file = NULL;	90	const char *arg_pid_file = NULL;
87	const char *arg_log_file = NULL;	91	const char *arg_log_file = NULL;
		92	const char *compiler_version = NULL;
88		93
89	/* Enumeration values for options that don't have single-letter name. These	94	/* Enumeration values for options that don't have single-letter name. These
90	* must be numerically above all the ascii letters. */	95	* must be numerically above all the ascii letters. */
Lines 115-120 Link Here
115	{ "verbose", 0, POPT_ARG_NONE, 0, 'v', 0, 0 },	120	{ "verbose", 0, POPT_ARG_NONE, 0, 'v', 0, 0 },
116	{ "version", 0, POPT_ARG_NONE, 0, 'V', 0, 0 },	121	{ "version", 0, POPT_ARG_NONE, 0, 'V', 0, 0 },
117	{ "wizard", 'W', POPT_ARG_NONE, 0, 'W', 0, 0 },	122	{ "wizard", 'W', POPT_ARG_NONE, 0, 'W', 0, 0 },
		123	#ifdef WITH_SLP
		124	{ "slp-identy", 0, POPT_ARG_STRING, &compiler_version, 0, 0, 0 },
		125	#endif
118	{ 0, 0, 0, 0, 0, 0, 0 }	126	{ 0, 0, 0, 0, 0, 0, 0 }
119	};	127	};
120		128
Lines 148-153 Link Here
148	" Mode of operation:\n"	156	" Mode of operation:\n"
149	" --inetd serve client connected to stdin\n"	157	" --inetd serve client connected to stdin\n"
150	" --daemon bind and listen on socket\n"	158	" --daemon bind and listen on socket\n"
		159	#ifdef WITH_SLP
		160	" SLP Identification:\n"
		161	" --slp-identy=STRING to identify the provided compiler\n"
		162	#endif
151	"\n"	163	"\n"
152	"distccd runs either from inetd or as a standalone daemon to compile\n"	164	"distccd runs either from inetd or as a standalone daemon to compile\n"
153	"files submitted by the distcc client.\n"	165	"files submitted by the distcc client.\n"
Lines 247-252 Link Here
247	}	259	}
248	}	260	}
249		261
		262	#ifdef WITH_SLP
		263	if ( compiler_version == NULL )
		264	compiler_version = used_compiler_version();
		265	#endif
		266
250	poptFreeContext(po);	267	poptFreeContext(po);
251	return 0;	268	return 0;
252		269

Lines 20-25 Link Here

(-)distcc-2.18.3/src/dopt.h (+4 lines)
20	* USA	20	* USA
21	*/	21	*/
22		22
		23	#include "config.h"
23		24
24	/* dopt.c */	25	/* dopt.c */
25	extern struct dcc_allow_list *opt_allowed;	26	extern struct dcc_allow_list *opt_allowed;
Lines 38-40 Link Here
38	extern int opt_lifetime;	39	extern int opt_lifetime;
39	extern char *opt_listen_addr;	40	extern char *opt_listen_addr;
40	extern int opt_niceness;	41	extern int opt_niceness;
		42	#ifdef WITH_SLP
		43	extern const char *compiler_version;
		44	#endif

Lines 70-75 Link Here

(-)distcc-2.18.3/src/dparent.c (+7 lines)
70	#include "types.h"	70	#include "types.h"
71	#include "daemon.h"	71	#include "daemon.h"
72	#include "netutil.h"	72	#include "netutil.h"
		73	#if WITH_SLP
		74	#include "register_slp.h"
		75	#endif
73		76
74	static void dcc_nofork_parent(int listen_fd) NORETURN;	77	static void dcc_nofork_parent(int listen_fd) NORETURN;
75	static void dcc_detach(void);	78	static void dcc_detach(void);
Lines 135-140 Link Here
135	* not. */	138	* not. */
136	dcc_master_pid = getpid();	139	dcc_master_pid = getpid();
137		140
		141	#ifdef WITH_SLP
		142	register_slp();
		143	#endif
		144
138	if (opt_no_fork) {	145	if (opt_no_fork) {
139	dcc_log_daemon_started("non-forking daemon");	146	dcc_log_daemon_started("non-forking daemon");
140	dcc_nofork_parent(listen_fd);	147	dcc_nofork_parent(listen_fd);

Lines 85-90 Link Here

(-)distcc-2.18.3/src/hosts.c (+28 lines)
85	#include <stdio.h>	85	#include <stdio.h>
86	#include <stdlib.h>	86	#include <stdlib.h>
87	#include <unistd.h>	87	#include <unistd.h>
		88	#include <sys/types.h>
		89	#include <sys/stat.h>
88	#include <string.h>	90	#include <string.h>
89	#include <errno.h>	91	#include <errno.h>
90	#include <time.h>	92	#include <time.h>
Lines 163-169 Link Here
163	rs_trace("not reading %s: %s", path, strerror(errno));	165	rs_trace("not reading %s: %s", path, strerror(errno));
164	free(path);	166	free(path);
165	}	167	}
		168
		169	#ifdef WITH_SLP
166		170
		171	char *home;
		172
		173	if ((home = getenv("HOME")) != NULL) {
		174	struct stat fst;
		175
		176	asprintf(&path, "%s/.distcc.slp.cache", home);
		177	/* the refresh rate of SLP cache is hardcoded to 5 minutes for now */
		178	if ( stat (path, &fst) \|\| fst.st_mtime < time (0) - 60*5 ) {
		179	unlink( path );
		180	/* sure, we could implement the SLP query also via a function
		181	call, but we would need to wait here anyway ... */
		182	execlp("distccenv", "distccenv", "--file", path, 0 );
		183	}
		184	if (access(path, R_OK) == 0) {
		185	ret = dcc_parse_hosts_file(path, ret_list, ret_nhosts);
		186	free(path);
		187	return ret;
		188	} else {
		189	rs_trace("not reading %s: %s", path, strerror(errno));
		190	free(path);
		191	}
		192	}
		193	#endif
		194
167	/* FIXME: Clearer message? */	195	/* FIXME: Clearer message? */
168	rs_log_warning("no hostlist is set; can't distribute work");	196	rs_log_warning("no hostlist is set; can't distribute work");
169		197




/* -*- c-file-style: "java"; indent-tabs-mode: nil -*-
 *
 * distcc -- A simple distributed compiler system
 *
 * Copyright (C) 2003 by Adrian Schroeter <adrian@suse.de>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 * USA
 */

#include "register_slp.h"

#ifdef WITH_SLP
#include <stdlib.h>
#include <string.h>
#include <signal.h>
#include <unistd.h>
#include <stdio.h>
#include <sys/utsname.h>
#include "dopt.h"
#include "trace.h"
#include "cc_version.h"

extern int dcc_max_kids;

void mySLPRegReport(SLPHandle hslp, SLPError errcode, void *cookie)
{
    hslp = hslp; cookie = cookie;
    if (errcode)
       rs_log_warning( "SLP (de)registration error" );
}

void refresh_slp(void)
{
      register_slp();
}

void register_slp(void)
{
      SLPHandle phslp;
      SLPError result;
      struct sigaction act, oact;
      /* TODO: make it a config option */
      /* hardcode it to 5 minutes now, because we use also the load
         from last 5 minutes */
      int slp_timeout = 60 * 3;

      /* do not bomb the slp server with wrong configuration */
      if ( slp_timeout < 120 )
        slp_timeout = 120 ;
      if ( slp_timeout > SLP_LIFETIME_MAXIMUM )
         slp_timeout = SLP_LIFETIME_MAXIMUM;

      result = SLPOpen( 0, SLP_FALSE, &phslp);
      if (result != SLP_OK)
         rs_log_warning( "SLPOpen failed" );
      else {
         char hostname[1024];
         char SLPServiceUrl[2048];
         char SLPattributes[2048];
         long load = -1, bogomips = 0;
         FILE *proc;

         gethostname( hostname, 1023 );
         /* Linux specific part, no idea how to do this in general */
         proc = fopen( "/proc/cpuinfo", "r" );
         if ( proc ){
           while( !feof(proc) ) {
               long b = 0;
               int ret;
               ret = fscanf( proc, "bogomips        : %ld", &b );
               if ( ret < 0 )
                  break;
               if ( ret )
                  bogomips += b;
               fseek( proc, 1L, SEEK_CUR );
           }
           fclose( proc );
         }

         proc = fopen( "/proc/loadavg", "r" );
         if ( proc ){
           fscanf( proc, "%*d.%*d %ld.%*d %*s %*s %*s", &load );
           fclose( proc );
         }
	 if ( !bogomips ) bogomips = 1;
	 load += 1;

         snprintf( SLPServiceUrl, 1023, "service:distccd.%s://%s:%i", compiler_version, hostname, arg_port );
         snprintf( SLPattributes, 1023, "(maxjobs=%d),(bogomips=%ld),(load=%ld)", dcc_max_kids, bogomips, load );

         result = SLPReg( phslp,
                          SLPServiceUrl,
                          slp_timeout,
                          0,
                          SLPattributes,
                          SLP_TRUE,
                          mySLPRegReport,
                          0 );

         if (result != SLP_OK)
            rs_log_warning( "unable to register SLP service" );
         SLPClose( phslp );

         /* sigalarm is also used in inetd mode, but we should never
            use SLP in inetd mode anyway ...                         */
         act.sa_handler = refresh_slp;
         if (0 != sigaction(SIGALRM, &act, &oact))
             rs_log_warning("Error establishing signal handler for SLP");
         alarm(slp_timeout - 15);
      }
}
#endif







#include "config.h"

#ifdef WITH_SLP

#include <slp.h>

void  register_slp(void);
char* used_compiler_version(void);

void refresh_slp(void);
void mySLPRegReport(SLPHandle hslp, SLPError errcode, void *cookie);

#endif


Return to bug 80219

Line 0 Link Here

(-)distcc-2.18.3/README.slp (+40 lines)
	1	#
	2	# SLP support in distcc
	3	#
	4
	5	It is enough to start the SLP server and distcc server, if you have
	6	compiled distccd with SLP support. You can simply use distcc as compiler
	7	afterwards.
	8
	9	NOTE: SLP support is only used, when distccd runs as daemon, not when
	10	running via inetd or xinetd !
	11
	12	The distcc frontend cache SLP results inside the $HOME/.distcc.slp.cache
	13	file. This file gets update every 3 minutes (hardcoded for now).
	14
	15	Alternative you can set the enviroment once via distccenv. A bash user
	16	might simply do to set $DISTCC_HOSTS with
	17
	18	eval `distccenv`
	19
	20	A distcc service url looks like
	21
	22	service:distccd.$IDENTITY
	23
	24	The identity is usually set based on the used compiler at build time
	25	of distcc and the used system architecture.
	26	However there is no check which checks the installed compiler, since it
	27	is not known how it is called at distccd startup time.
	28
	29	You can set the IDENTITY during distccd startup via the --slp-identy=$IDENTITY
	30	switch. You need to set the $DISTCC_IDENTITY enviroment variable to the
	31	same value afterwards inside your enviroment (or during distccenv run).
	32
	33	There is some very basic load balancing code. You can enable it via
	34
	35	export DISTCC_LOAD_BALANCE=1
	36
	37	in your compile enviroment. It is not active, if $DISTCC_HOSTS is set.
	38
	39	Have fun, adrian.
	40

Lines 89-95 Link Here

(-)distcc-2.18.3/configure.ac (-2 / +32 lines)
89	AC_HELP_STRING([--enable-rfc2553], [use getaddrinfo, getnameinfo, etc]),	89	AC_HELP_STRING([--enable-rfc2553], [use getaddrinfo, getnameinfo, etc]),
90	AC_DEFINE(ENABLE_RFC2553,1,[Use getaddrinfo(), getnameinfo(), etc]))	90	AC_DEFINE(ENABLE_RFC2553,1,[Use getaddrinfo(), getnameinfo(), etc]))
91		91
92
93	AC_ARG_WITH(gnome,	92	AC_ARG_WITH(gnome,
94	AC_HELP_STRING([--with-gnome], [build GNOME-based monitor]))	93	AC_HELP_STRING([--with-gnome], [build GNOME-based monitor]))
95		94
Lines 286-298 Link Here
286	AC_MSG_RESULT(no)	285	AC_MSG_RESULT(no)
287	fi	286	fi
288		287
		288	########################################################################
		289	# Check for OpenSLP
		290	AC_ARG_ENABLE(slp, [ --enable-slp find hosts via slp], with_slp=$enableval, with_slp=no)
		291	if test "$with_slp" = "yes"; then
		292	AC_MSG_CHECKING(for SLP support)
		293	save_slptest_LIBS="$LIBS"
		294	save_slptest_LDFLAGS="$LDFLAGS"
		295	save_slptest_CPPFLAGS="$CPPFLAGS"
		296	LDFLAGS="$all_libraries $LDFLAGS"
		297	CPPFLAGS="$CPPFLAGS $all_includes"
		298	LIBS="-lslp"
		299	AC_TRY_LINK( [
		300	#include <slp.h>
		301	],[
		302	SLPOpen(0, SLP_FALSE, (SLPHandle*) 0);
		303	],[
		304	AC_DEFINE(WITH_SLP,1,[Define if SLP is avaible and enabled])
		305	LIB_SLP="-lslp"
		306	SLP_BIN=distccenv
		307	BUILD_SLP='$(slp_OBJS)'
		308	AC_MSG_RESULT(yes)
		309	],[
		310	AC_MSG_ERROR(no)
		311	])
		312	CPPFLAGS=$save_slptest_CPPFLAGS
		313	LDFLAGS=$save_slptest_LDFLAGS
		314	LIBS=$save_slptest_LIBS
		315	fi
		316	AC_SUBST(LIB_SLP)
		317
289		318
290		319
291	########################################################################	320	########################################################################
292	# Check for types	321	# Check for types
293	AC_TYPE_SIGNAL	322	AC_TYPE_SIGNAL
294		323
295
296	########################################################################	324	########################################################################
297	# Checks for library functions, using libraries discovered above	325	# Checks for library functions, using libraries discovered above
298	CPPFLAGS="$CPPFLAGS -I$srcdir/src"	326	CPPFLAGS="$CPPFLAGS -I$srcdir/src"
Lines 393-398 Link Here
393	AC_SUBST(CPPFLAGS)	421	AC_SUBST(CPPFLAGS)
394	AC_SUBST(BUILD_POPT)	422	AC_SUBST(BUILD_POPT)
395	AC_SUBST(GNOME_BIN)	423	AC_SUBST(GNOME_BIN)
		424	AC_SUBST(SLP_BIN)
		425	AC_SUBST(BUILD_SLP)
396	dnl AC_DEFINE_UNQUOTED(PACKAGE, $PACKAGE, [Package name])	426	dnl AC_DEFINE_UNQUOTED(PACKAGE, $PACKAGE, [Package name])
397	dnl AC_DEFINE_UNQUOTED(VERSION, $VERSION, [Package version])	427	dnl AC_DEFINE_UNQUOTED(VERSION, $VERSION, [Package version])
398	AC_DEFINE_UNQUOTED(GNU_HOST, ["$host"], [Your gnu-style host triple])	428	AC_DEFINE_UNQUOTED(GNU_HOST, ["$host"], [Your gnu-style host triple])

Line 0 Link Here

(-)distcc-2.18.3/src/cc_version.c (+93 lines)
		1	/* -- c-file-style: "java"; indent-tabs-mode: nil --
		2	*
		3	* distcc -- A simple distributed compiler system
		4	*
		5	* Copyright (C) 2003 by Adrian Schroeter <adrian@suse.de>
		6	*
		7	* This program is free software; you can redistribute it and/or
		8	* modify it under the terms of the GNU General Public License as
		9	* published by the Free Software Foundation; either version 2 of the
		10	* License, or (at your option) any later version.
		11	*
		12	* This program is distributed in the hope that it will be useful, but
		13	* WITHOUT ANY WARRANTY; without even the implied warranty of
		14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		15	* General Public License for more details.
		16	*
		17	* You should have received a copy of the GNU General Public License
		18	* along with this program; if not, write to the Free Software
		19	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
		20	* USA
		21	*/
		22
		23	#include <stdlib.h>
		24	#include <string.h>
		25	#include <stdio.h>
		26	#include <sys/utsname.h>
		27	#include "cc_version.h"
		28	#include "config.h"
		29
		30	char *used_compiler_version(void)
		31	{
		32	char *compiler = NULL;
		33	char *architecture = NULL;
		34	char *ret;
		35	int len;
		36
		37	/* The enviroment is always right ... */
		38	if ( getenv("DISTCC_IDENTIFY") )
		39	return getenv("DISTCC_IDENTIFY");
		40
		41	/* do we really want a runtime check here ? */
		42	/* it would be worse performance wise for the distcc frontend ... */
		43
		44	/* default compiler based on distcc build time */
		45	#ifdef __GNUC__
		46	#ifdef __GNUC_MINOR__
		47	#ifdef __GNUC_PATCHLEVEL__
		48	compiler = (char*) malloc( 33 );
		49	snprintf( compiler, 32, "gcc-%d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__ );
		50	#endif
		51	#endif
		52	#endif
		53
		54	#ifdef GNU_HOST
		55	architecture = strdup(GNU_HOST);
		56	{
		57	char *p;
		58	p = strstr( architecture, "-" );
		59	if (p){
		60	*p = '\0';
		61	/* unify all different ia32 systems */
		62	p = architecture;
		63	if ( p[0] == 'i' && p[2] == '8' && p[3] == '6' && p[4] == '\0' )
		64	p[1] = '3';
65	}
66	}
67	#endif
68
69	if ( compiler == NULL ){
70	/* we use the system release, this is unreleated to the compiler
71	version, but better than default ... */
72	struct utsname t;
73	if ( !uname( &t ) )
74	compiler = t.release;
75	}
76	if ( architecture == NULL ){
77	struct utsname t;
78	if ( !uname( &t ) )
79	architecture = t.machine;
80	}
81
82	/* fallback values */
83	if ( compiler == NULL )
84	compiler = strdup("default");
85	if ( architecture == NULL )
86	architecture = strdup("default");
87
88	len = strlen(compiler) + 1 + strlen(architecture) + 1;
89	ret = (char*) malloc(len + 1);
90	snprintf( ret, len, "%s-%s", compiler, architecture );
91	return ret;
92	}
93

Line 0 Link Here

(-)distcc-2.18.3/src/distccenv.c (+205 lines)
		1
		2	#include "config.h"
		3
		4	#ifndef WITH_SLP
		5	#error distccenv needs SLP atm.
		6	#endif
		7
		8	#include <stdlib.h>
		9	#include <stdio.h>
		10	#include <string.h>
		11
		12	#include "register_slp.h"
		13
		14	#define BUFFER 1024
		15
		16	char compiler[BUFFER + 1];
		17	FILE *out;
		18
		19	#define MAX_HOSTS 256
		20	struct dcc_host{
		21	char *url;
		22	int jobs;
		23	float speed;
		24	float load;
		25	long value;
		26	};
		27	struct dcc_host hosts[MAX_HOSTS];
		28	int host_count = 0;
		29
		30	int slp_calls = 0;
		31	int load_balancing = 0;
		32
		33	void dump_result(void);
		34	SLPBoolean myAttrCallback(SLPHandle phslp, char* attrlist,
		35	SLPError errcode, void* cookie );
		36	SLPBoolean MySLPSrvURLCallback( SLPHandle phslp, const char* srvurl,
		37	unsigned short lifetime, SLPError errcode,
		38	void* cookie );
		39
		40	void dump_result(void)
		41	{
		42	int h, j, max_jobs = 0;
		43	float avg_speed = 0, avg_load = 0;
		44
		45	if ( host_count == 0 )
		46	exit(-1);
		47
		48	if ( !out )
		49	printf( "DISTCC_HOSTS=\"" );
		50
		51	if ( load_balancing )
		52	{
		53	for ( h = 0; h<host_count; h++ ){
		54	avg_speed += hosts[h].speed;
		55	avg_load += hosts[h].load;
		56	}
		57	avg_speed /= host_count;
		58	avg_load /= host_count;
		59
		60	for ( h = 0; h<host_count; h++ ){
		61	hosts[h].value = hosts[h].jobs
		62	* ( hosts[h].speed / avg_speed );
		63	#if 0
		64	// load might be misleading, so we only care about bogomips atm
65	// beside of architectures with random bogomips values (like s390)
66	// this should work so far now.
67	* ( avg_load / hosts[h].load );
68	#endif
69	if ( max_jobs < hosts[h].value )
70	max_jobs = hosts[h].value;
71	}
72	}
73
74	for ( j = 0; j<(load_balancing?max_jobs:1); j++ ){
75	for ( h = 0; h<host_count; h++ ){
76	if ( !load_balancing \|\| j < hosts[h].value ){
77	if ( out ){
78	fputs( hosts[h].url, out );
79	fputs( "\n", out );
80	}else{
81	printf( "%s ", hosts[h].url );
82	}
83	}
84	}
85	}
86
87	if ( out )
88	fclose( out );
89	else
90	printf( "\"\n" );
91	exit(0);
92	}
93
94	SLPBoolean myAttrCallback(SLPHandle phslp,
95	char* attrlist,
96	SLPError errcode,
97	void* cookie )
98	{
99	phslp = phslp;
100	struct dcc_host *_host = &(hosts[(long)cookie]);
101
102	if(attrlist && errcode == SLP_OK)
103	{
104	char *p;
105
106	p = strstr( attrlist, "(maxjobs=" );
107	if ( p )
108	_host->jobs = atoi( p + strlen("(maxjobs=") );
109
110	p = strstr( attrlist, "(bogomips=" );
111	if ( p )
112	_host->speed = atol( p + strlen("(bogomips=") );
113
114	p = strstr( attrlist, "(load=" );
115	if ( p )
116	_host->load = atol( p + strlen("(load=") );
117	}
118
119	return SLP_FALSE;
120	}
121
122	SLPBoolean MySLPSrvURLCallback( SLPHandle phslp,
123	const char* srvurl,
124	unsigned short lifetime,
125	SLPError errcode,
126	void* cookie )
127	{
128	phslp = phslp; lifetime = lifetime; cookie = cookie;
129
130	if ( host_count >= MAX_HOSTS \|\| !srvurl
131	\|\| strncmp( compiler, srvurl, strlen(compiler) ) )
132	return SLP_TRUE;
133
134	if(errcode == SLP_OK \|\| errcode == SLP_LAST_CALL)
135	{
136	hosts[host_count].url = strdup((char*)(strlen(compiler) + srvurl + 3));
137	hosts[host_count].jobs = -1;
138	hosts[host_count].speed = -1;
139	host_count++;
140	}
141
142	return SLP_TRUE;
143	}
144
145	int main( int argc, char *argv[] )
146	{
147	long h;
148	SLPHandle phslp;
149	SLPError result;
150	char *p;
151
152	out = 0;
153
154	p = getenv("DISTCC_LOAD_BALANCE");
155	if ( p && (!strcmp( "1", p)\|\|!strncmp( "y", p, 1)) )
156	load_balancing = 1;
157
158	if ( argc > 2 && !strcmp(argv[1], "--file" ) )
159	out = fopen( argv[2], "w" );
160
161	snprintf( compiler, BUFFER, "service:distccd.%s", used_compiler_version() );
162
163	result = SLPOpen( NULL, SLP_FALSE, &phslp);
164	if (result != SLP_OK) {
165	fprintf( stderr, "SLPOpen failed ! Aborting ... " );
166	exit( -1 );
167	} else {
168	result = SLPFindSrvs( phslp,
169	compiler,
170	"", // TODO: Scope selector
171	"", // all services
172	MySLPSrvURLCallback,
173	0 );
174	if (result != SLP_OK){
175	fprintf( stderr, "unable to query for services ! Aborting .." );
176	exit(-1);
177	}
178
179	if ( load_balancing )
180	{
181	for ( h = 0; h < host_count; h++ )
182	{
183	char buf[BUFFER+1];
184	snprintf( buf, BUFFER, "%s://%s", compiler, hosts[h].url );
185	result = SLPFindAttrs(phslp,
186	buf,
187	"",
188	"maxjobs,bogomips,load",
189	myAttrCallback,
190	(void*)h);
191	if(result != SLP_OK)
192	{
193	printf("unable to request SLP attributes: %i\n",result);
194	exit(-1);
195	}
196	}
197	}else
198	dump_result();
199
200	SLPClose( phslp );
201	}
202
203	dump_result();
204	return 0;
205	}

Line 0 Link Here

(-)distcc-2.18.3/src/register_slp.c (+127 lines)
		1	/* -- c-file-style: "java"; indent-tabs-mode: nil --
		2	*
		3	* distcc -- A simple distributed compiler system
		4	*
		5	* Copyright (C) 2003 by Adrian Schroeter <adrian@suse.de>
		6	*
		7	* This program is free software; you can redistribute it and/or
		8	* modify it under the terms of the GNU General Public License as
		9	* published by the Free Software Foundation; either version 2 of the
		10	* License, or (at your option) any later version.
		11	*
		12	* This program is distributed in the hope that it will be useful, but
		13	* WITHOUT ANY WARRANTY; without even the implied warranty of
		14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		15	* General Public License for more details.
		16	*
		17	* You should have received a copy of the GNU General Public License
		18	* along with this program; if not, write to the Free Software
		19	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
		20	* USA
		21	*/
		22
		23	#include "register_slp.h"
		24
		25	#ifdef WITH_SLP
		26	#include <stdlib.h>
		27	#include <string.h>
		28	#include <signal.h>
		29	#include <unistd.h>
		30	#include <stdio.h>
		31	#include <sys/utsname.h>
		32	#include "dopt.h"
		33	#include "trace.h"
		34	#include "cc_version.h"
		35
		36	extern int dcc_max_kids;
		37
		38	void mySLPRegReport(SLPHandle hslp, SLPError errcode, void *cookie)
		39	{
		40	hslp = hslp; cookie = cookie;
		41	if (errcode)
		42	rs_log_warning( "SLP (de)registration error" );
		43	}
		44
		45	void refresh_slp(void)
		46	{
		47	register_slp();
		48	}
		49
		50	void register_slp(void)
		51	{
		52	SLPHandle phslp;
		53	SLPError result;
		54	struct sigaction act, oact;
		55	/* TODO: make it a config option */
		56	/* hardcode it to 5 minutes now, because we use also the load
		57	from last 5 minutes */
		58	int slp_timeout = 60 * 3;
		59
		60	/* do not bomb the slp server with wrong configuration */
		61	if ( slp_timeout < 120 )
		62	slp_timeout = 120 ;
		63	if ( slp_timeout > SLP_LIFETIME_MAXIMUM )
		64	slp_timeout = SLP_LIFETIME_MAXIMUM;
65
66	result = SLPOpen( 0, SLP_FALSE, &phslp);
67	if (result != SLP_OK)
68	rs_log_warning( "SLPOpen failed" );
69	else {
70	char hostname[1024];
71	char SLPServiceUrl[2048];
72	char SLPattributes[2048];
73	long load = -1, bogomips = 0;
74	FILE *proc;
75
76	gethostname( hostname, 1023 );
77	/* Linux specific part, no idea how to do this in general */
78	proc = fopen( "/proc/cpuinfo", "r" );
79	if ( proc ){
80	while( !feof(proc) ) {
81	long b = 0;
82	int ret;
83	ret = fscanf( proc, "bogomips : %ld", &b );
84	if ( ret < 0 )
85	break;
86	if ( ret )
87	bogomips += b;
88	fseek( proc, 1L, SEEK_CUR );
89	}
90	fclose( proc );
91	}
92
93	proc = fopen( "/proc/loadavg", "r" );
94	if ( proc ){
95	fscanf( proc, "%d.%d %ld.%d %s %s %s", &load );
96	fclose( proc );
97	}
98	if ( !bogomips ) bogomips = 1;
99	load += 1;
100
101	snprintf( SLPServiceUrl, 1023, "service:distccd.%s://%s:%i", compiler_version, hostname, arg_port );
102	snprintf( SLPattributes, 1023, "(maxjobs=%d),(bogomips=%ld),(load=%ld)", dcc_max_kids, bogomips, load );
103
104	result = SLPReg( phslp,
105	SLPServiceUrl,
106	slp_timeout,
107	0,
108	SLPattributes,
109	SLP_TRUE,
110	mySLPRegReport,
111	0 );
112
113	if (result != SLP_OK)
114	rs_log_warning( "unable to register SLP service" );
115	SLPClose( phslp );
116
117	/* sigalarm is also used in inetd mode, but we should never
118	use SLP in inetd mode anyway ... */
119	act.sa_handler = refresh_slp;
120	if (0 != sigaction(SIGALRM, &act, &oact))
121	rs_log_warning("Error establishing signal handler for SLP");
122	alarm(slp_timeout - 15);
123	}
124	}
125	#endif
126
127

Line 0 Link Here

(-)distcc-2.18.3/src/register_slp.h (+15 lines)
	1
	2	#include "config.h"
	3
	4	#ifdef WITH_SLP
	5
	6	#include <slp.h>
	7
	8	void register_slp(void);
	9	char* used_compiler_version(void);
	10
	11	void refresh_slp(void);
	12	void mySLPRegReport(SLPHandle hslp, SLPError errcode, void *cookie);
	13
	14	#endif
	15