[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    icecream/client
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-07-05 20:29:39
Message-ID: 1152131379.967789.25266.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 558681 by mueller:

lovely, nice bug. when it wasn't able to talk to the daemon,
it waited for a reply forever.


 M  +11 -4     main.cpp  
 M  +1 -2      remote.cpp  


--- trunk/icecream/client/main.cpp #558680:558681
@@ -289,11 +289,18 @@
     if ( local ) {
         log_block b("building_local");
         struct rusage ru;
+        Msg* startme = 0L;
+
 	/* Inform the daemon that we like to start a job.  */
-        local_daemon->send_msg( JobLocalBeginMsg( 0, get_absfilename( job.outputFile() )) );
-	/* Now wait until the daemon gives us the start signal.  40 minutes
-	   should be enough for all normal compile or link jobs.  */
-	Msg *startme = local_daemon->get_msg (40*60);
+        if (local_daemon->send_msg( JobLocalBeginMsg( 0, get_absfilename( job.outputFile() )) ))
+          {
+              /* Now wait until the daemon gives us the start signal.  40 minutes
+                 should be enough for all normal compile or link jobs.  */
+              startme = local_daemon->get_msg (40*60);
+          }
+        else
+          log_error() << "can't send joblocalmsg to daemon" << endl;
+
 	/* If we can't talk to the daemon anymore we need to fall back
 	   to lock file locking.  */
         if (!startme || startme->type != M_JOB_LOCAL_BEGIN)
--- trunk/icecream/client/remote.cpp #558680:558681
@@ -514,8 +514,7 @@
         if (msg.user_msec > 50 && msg.out_uncompressed > 1024)
           trace() << "speed=" << float(msg.out_uncompressed / msg.user_msec) << endl;
 
-        local_daemon->send_msg( msg );
-        return true;
+        return local_daemon->send_msg( msg );
     }
     return false;
 }
[prev in list] [next in list] [prev in thread] [next in thread]