[can-utils] canbusload: flush output at the end of each cycle

[can-utils] canbusload: flush output at the end of each cycle

[Kurt Van Dijck]

canbusload: flush output at the end of each cycle

When canbusload is piped to another program, the output
is queued for several cycles. This patch will flush the output
explicitely.

Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be>

This patch is available in git@gitorious.org:~kurt-vd/can-j1939-utils
in branch regular.

diff --git a/canbusload.c b/canbusload.c
index 26323d2..2693b9e 100644
--- a/canbusload.c
+++ b/canbusload.c
@@ -201,6 +201,7 @@ void printstats(int signo)
 	}
 
 	printf("\n");
+	fflush(stdout);
 
 	alarm(1);
 }

Re: [can-utils] canbusload: flush output at the end of each cycle

[Oliver Hartkopp]

On 21.12.2011 10:19, Kurt Van Dijck wrote:

> canbusload: flush output at the end of each cycle
> 
> When canbusload is piped to another program, the output
> is queued for several cycles. This patch will flush the output
> explicitely.
> 
> Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be>


Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>

Tnx Kurt.

I'll put it into the can-utils tree the next days.

Regards,
Oliver

> 
> This patch is available in git@gitorious.org:~kurt-vd/can-j1939-utils
> in branch regular.
> 
> diff --git a/canbusload.c b/canbusload.c
> index 26323d2..2693b9e 100644
> --- a/canbusload.c
> +++ b/canbusload.c
> @@ -201,6 +201,7 @@ void printstats(int signo)
>  	}
>  
>  	printf("\n");
> +	fflush(stdout);
>  
>  	alarm(1);
>  }
> --
> To unsubscribe from this list: send the line "unsubscribe linux-can" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [can-utils] canbusload: flush output at the end of each cycle

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 884 bytes --]

On 12/22/2011 07:40 AM, Oliver Hartkopp wrote:
> On 21.12.2011 10:19, Kurt Van Dijck wrote:
> 
>> canbusload: flush output at the end of each cycle
>>
>> When canbusload is piped to another program, the output
>> is queued for several cycles. This patch will flush the output
>> explicitely.
>>
>> Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be>
> 
> 
> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
> 
> Tnx Kurt.
> 
> I'll put it into the can-utils tree the next days.

nitpick:
Oliver, please don't forget to add your S-o-b if you are pushing commits
to the tree.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

Re: [can-utils] canbusload: flush output at the end of each cycle

[Oliver Hartkopp]

On 11.01.2012 12:12, Marc Kleine-Budde wrote:

> On 12/22/2011 07:40 AM, Oliver Hartkopp wrote:
>> On 21.12.2011 10:19, Kurt Van Dijck wrote:
>>
>>> canbusload: flush output at the end of each cycle
>>>
>>> When canbusload is piped to another program, the output
>>> is queued for several cycles. This patch will flush the output
>>> explicitely.
>>>
>>> Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be>
>>
>>
>> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
>>
>> Tnx Kurt.
>>
>> I'll put it into the can-utils tree the next days.
> 
> nitpick:
> Oliver, please don't forget to add your S-o-b if you are pushing commits
> to the tree.


Yes. I noticed myself, that i need to improve this process by reading more git
documentation ;-)

Yesterday i just cherry-picked the patch and pushed it to the repo.

The next time i'll do it the right(TM) way :-)

Regards,
Oliver

using git

[Kurt Van Dijck]

> > nitpick:
> > Oliver, please don't forget to add your S-o-b if you are pushing commits
> > to the tree.
> 
> 
> Yes. I noticed myself, that i need to improve this process by reading more git
> documentation ;-)
> 
> Yesterday i just cherry-picked the patch and pushed it to the repo.
> 
> The next time i'll do it the right(TM) way :-)

Oliver or Marc,

just out of curiosity,
what would be the right(TM) way?

regards,
Kurt

Re: using git

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 1302 bytes --]

On 01/11/2012 01:26 PM, Kurt Van Dijck wrote:
>>> nitpick:
>>> Oliver, please don't forget to add your S-o-b if you are pushing commits
>>> to the tree.
>>
>>
>> Yes. I noticed myself, that i need to improve this process by reading more git
>> documentation ;-)
>>
>> Yesterday i just cherry-picked the patch and pushed it to the repo.
>>
>> The next time i'll do it the right(TM) way :-)
> 
> Oliver or Marc,
> 
> just out of curiosity,
> what would be the right(TM) way?

3 possibilities:

1) merge your tree:
(if it only contains the patch we want)

git checkout master
git merge tree-of-kvd/branch-name
git push origin master

2) cherry pick

git checkout master
git cherry-pick -s commitish-of-patch  # -s automatically adds the S-o-b
git push origin master

3) apply patch

git checkout master
git am -s /path/to/patch               # -s automatically adds the S-o-b
git push origin master


For solution 1 and 2 you need Kurt's tree in your local repo (git remote
add).

Marc
-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

Re: using git

[Kurt Van Dijck]

On Wed, Jan 11, 2012 at 01:39:02PM +0100, Marc Kleine-Budde wrote:
> On 01/11/2012 01:26 PM, Kurt Van Dijck wrote:
> >>> nitpick:
> >>> Oliver, please don't forget to add your S-o-b if you are pushing commits
> >>> to the tree.
> >>
> >>
> >> Yes. I noticed myself, that i need to improve this process by reading more git
> >> documentation ;-)
> >>
> >> Yesterday i just cherry-picked the patch and pushed it to the repo.
> >>
> >> The next time i'll do it the right(TM) way :-)
> > 
> > Oliver or Marc,
> > 
> > just out of curiosity,
> > what would be the right(TM) way?
> 
> 3 possibilities:
> 
> 1) merge your tree:
> (if it only contains the patch we want)
> 
> git checkout master
> git merge tree-of-kvd/branch-name
> git push origin master
> 
> 2) cherry pick
> 
> git checkout master
> git cherry-pick -s commitish-of-patch  # -s automatically adds the S-o-b
> git push origin master
> 
> 3) apply patch
> 
> git checkout master
> git am -s /path/to/patch               # -s automatically adds the S-o-b
> git push origin master
> 

thanks for this lesson :-)
1 additional question:
Would in case 3 the SHA commit name be the same?

Thanks,
Kurt
> 
> For solution 1 and 2 you need Kurt's tree in your local repo (git remote
> add).
> 
> Marc

Re: using git

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 2097 bytes --]

On 01/11/2012 01:54 PM, Kurt Van Dijck wrote:
> On Wed, Jan 11, 2012 at 01:39:02PM +0100, Marc Kleine-Budde wrote:
>> On 01/11/2012 01:26 PM, Kurt Van Dijck wrote:
>>>>> nitpick:
>>>>> Oliver, please don't forget to add your S-o-b if you are pushing commits
>>>>> to the tree.
>>>>
>>>>
>>>> Yes. I noticed myself, that i need to improve this process by reading more git
>>>> documentation ;-)
>>>>
>>>> Yesterday i just cherry-picked the patch and pushed it to the repo.
>>>>
>>>> The next time i'll do it the right(TM) way :-)
>>>
>>> Oliver or Marc,
>>>
>>> just out of curiosity,
>>> what would be the right(TM) way?
>>
>> 3 possibilities:
>>
>> 1) merge your tree:
>> (if it only contains the patch we want)
>>
>> git checkout master
>> git merge tree-of-kvd/branch-name
>> git push origin master
>>
>> 2) cherry pick
>>
>> git checkout master
>> git cherry-pick -s commitish-of-patch  # -s automatically adds the S-o-b
>> git push origin master
>>
>> 3) apply patch
>>
>> git checkout master
>> git am -s /path/to/patch               # -s automatically adds the S-o-b
>> git push origin master
>>
> 
> thanks for this lesson :-)
> 1 additional question:
> Would in case 3 the SHA commit name be the same?

Compared 2 and 3?

Usually not. As the meta data (here the timestamps) will be included in
the  calculation of the committish, it won't be the same. E.g. the meta
data of your commit in master:

Author:     Kurt Van Dijck <kurt.van.dijck@eia.be>
AuthorDate: Wed Dec 21 10:08:57 2011 +0100
Commit:     Oliver Hartkopp <socketcan@hartkopp.net>
CommitDate: Tue Jan 10 17:41:07 2012 +0100

But you can tweak the timestamps, e.g. during "git commit --amend" with
the environment variables GIT_AUTHOR_DATE, GIT_COMMITTER_DATE ("man
git-commit").

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

git question

[Kurt Van Dijck]

> nitpick:
> Oliver, please don't forget to add your S-o-b if you are pushing commits
> to the tree.
in that regard, I was wondering if one could add the S-o-b way after
the actual commit? 

Kurt

Re: git question

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 732 bytes --]

On 01/11/2012 12:18 PM, Kurt Van Dijck wrote:
>> nitpick:
>> Oliver, please don't forget to add your S-o-b if you are pushing commits
>> to the tree.
> in that regard, I was wondering if one could add the S-o-b way after
> the actual commit? 

Yes but no.

Yes, you can change the commit message (git commit --amend), but if you
have already pushed it to the central repo on gitorious, you should not
do it, as it changes the history.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

Re: git question

[Kurt Van Dijck]

On Wed, Jan 11, 2012 at 12:28:21PM +0100, Marc Kleine-Budde wrote:
> On 01/11/2012 12:18 PM, Kurt Van Dijck wrote:
> >> nitpick:
> >> Oliver, please don't forget to add your S-o-b if you are pushing commits
> >> to the tree.
> > in that regard, I was wondering if one could add the S-o-b way after
> > the actual commit? 
> 
> Yes but no.
> 
> Yes, you can change the commit message (git commit --amend), but if you
> have already pushed it to the central repo on gitorious, you should not
> do it, as it changes the history.

thanks for the answer.
Kurt