* [Lustre-devel] cvs question
@ 2009-05-20 17:39 Bernd Schubert
2009-05-20 18:41 ` Brian J. Murrell
0 siblings, 1 reply; 2+ messages in thread
From: Bernd Schubert @ 2009-05-20 17:39 UTC (permalink / raw)
To: lustre-devel
Hello,
I just want to backport the patches of bug#18414 and there is merge conflict,
something is missing. So I want to check with cvs what that is, but the
result is a bit weird (on b1_6):
cvs annotate lnet/libcfs/watchdog.c
1.2 (eeb 09-Dec-04): static void lcw_cb(unsigned long data)
1.2 (eeb 09-Dec-04): {
1.2 (eeb 09-Dec-04): struct lc_watchdog *lcw = (struct
lc_watchdog *)data;
1.2 (eeb 09-Dec-04):
1.2 (eeb 09-Dec-04): ENTRY;
1.2 (eeb 09-Dec-04):
1.2 (eeb 09-Dec-04): if (lcw->lcw_state !=
LC_WATCHDOG_ENABLED) {
1.2 (eeb 09-Dec-04): EXIT;
1.2 (eeb 09-Dec-04): return;
1.2 (eeb 09-Dec-04): }
1.2 (eeb 09-Dec-04):
1.2 (eeb 09-Dec-04): lcw->lcw_state =
LC_WATCHDOG_EXPIRED;
1.2 (eeb 09-Dec-04):
1.6 (nathan 10-Feb-07): /* NB this warning should appear on
the console, but may not get into
1.6 (nathan 10-Feb-07): * the logs since we're running in
a softirq handler */
1.6 (nathan 10-Feb-07):
1.7 (nathan 26-Feb-07): CWARN("Watchdog triggered for pid
%d: it was inactive for %lds\n",
1.7 (nathan 26-Feb-07): (int)lcw->lcw_pid,
cfs_duration_sec(lcw->lcw_time));
1.6 (nathan 10-Feb-07): lcw_dump(lcw);
But this looks different than the file itself:
static void lcw_cb(unsigned long data)
{
struct lc_watchdog *lcw = (struct lc_watchdog *)data;
cfs_time_t current_time;
cfs_duration_t delta_time;
struct timeval timediff;
ENTRY;
if (lcw->lcw_state != LC_WATCHDOG_ENABLED) {
EXIT;
return;
}
lcw->lcw_state = LC_WATCHDOG_EXPIRED;
current_time = cfs_time_current();
delta_time = cfs_time_sub(current_time, lcw->lcw_last_touched);
cfs_duration_usec(delta_time, &timediff);
So what is going on there? Where does for example
current_time = cfs_time_current();
come from? I'm confused as usual how cvs handles things.
Thanks,
Bernd
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Lustre-devel] cvs question
2009-05-20 17:39 [Lustre-devel] cvs question Bernd Schubert
@ 2009-05-20 18:41 ` Brian J. Murrell
0 siblings, 0 replies; 2+ messages in thread
From: Brian J. Murrell @ 2009-05-20 18:41 UTC (permalink / raw)
To: lustre-devel
On Wed, 2009-05-20 at 19:39 +0200, Bernd Schubert wrote:
> Hello,
Hi,
> cvs annotate lnet/libcfs/watchdog.c
>
> 1.2 (eeb 09-Dec-04): static void lcw_cb(unsigned long data)
> 1.2 (eeb 09-Dec-04): {
> 1.2 (eeb 09-Dec-04): struct lc_watchdog *lcw = (struct
> lc_watchdog *)data;
> 1.2 (eeb 09-Dec-04):
> 1.2 (eeb 09-Dec-04): ENTRY;
> 1.2 (eeb 09-Dec-04):
> 1.2 (eeb 09-Dec-04): if (lcw->lcw_state !=
> LC_WATCHDOG_ENABLED) {
> 1.2 (eeb 09-Dec-04): EXIT;
> 1.2 (eeb 09-Dec-04): return;
> 1.2 (eeb 09-Dec-04): }
> 1.2 (eeb 09-Dec-04):
> 1.2 (eeb 09-Dec-04): lcw->lcw_state =
> LC_WATCHDOG_EXPIRED;
> 1.2 (eeb 09-Dec-04):
> 1.6 (nathan 10-Feb-07): /* NB this warning should appear on
> the console, but may not get into
> 1.6 (nathan 10-Feb-07): * the logs since we're running in
> a softirq handler */
> 1.6 (nathan 10-Feb-07):
> 1.7 (nathan 26-Feb-07): CWARN("Watchdog triggered for pid
> %d: it was inactive for %lds\n",
> 1.7 (nathan 26-Feb-07): (int)lcw->lcw_pid,
> cfs_duration_sec(lcw->lcw_time));
> 1.6 (nathan 10-Feb-07): lcw_dump(lcw);
Notice the revision numbers. They are all off of HEAD, which on b1_6,
this file is almost certainly not. Perhaps you need to add a "-r b1_6"
to your cvs annotate command.
b.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.lustre.org/pipermail/lustre-devel-lustre.org/attachments/20090520/cc8f8ce7/attachment.pgp>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-05-20 18:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-20 17:39 [Lustre-devel] cvs question Bernd Schubert
2009-05-20 18:41 ` Brian J. Murrell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.