RE: [Xenomai-help] Modification of the PSOS skin. [update]

RE: [Xenomai-help] Modification of the PSOS skin. [update]

[Antoine.BRUGEAS]

Result of the diff command :

*************************for psos.h

321a322
> #define ERR_SSFN     0x03     /* Illegal system service function number */
325a327
> #define ERR_OBJTFULL 0x08     /* Node's Object table full */
327a330
> #define ERR_RSTFS    0x0D     /* Informative; files may be corrupted */
338a342,345
> #define ERR_DELFS    0x18     /* pHILE+ resources in use */
> #define ERR_DELLC    0x19     /* pREPC+ resources in use */
> #define ERR_DELNS    0x1A     /* pNA+ resources in use */
> 
343a351,352
> 
> #define ERR_ZERO     0x20     /* Cannot getseg; request size of zero is */
359a369
> #define ERR_KISIZE   0x30     /* Message length exceeds KI maximum */
380a391
> 
388a400,408
> #define ERR_ILLRSC   0x53     /* Object not created from this node */
> #define ERR_NOAGNT   0x54     /* Cannot wait; the remote node is out */
>                               /* of Agents */
> #define ERR_AGTBLKD  0x55     /* Agent blocked.  This is not an error. */
> 
> #define ERR_STALEID  0x65     /* Object does not exist any more */
> #define ERR_NDKLD    0x66     /* Remote Node no longer in service */
> #define ERR_MASTER   0x67     /* Cannot terminate Master node */
> 


*************************for task.c

177c177,189
<     task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
---
>     //task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
>     if (tid == 0)/*Add by AB*/
> 	task = psos_current_task();
>     else
> 	{
> 	task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
> 
> 	if (!task)
> 	    {
> 	    err = psos_handle_error(tid,PSOS_TASK_MAGIC,psostask_t);
> 	    goto unlock_and_exit;
> 	    }
> 	}
224c236,248
<     task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
---
> //    task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
>     if (tid == 0)/*Add by AB*/
> 	task = psos_current_task();
>     else
> 	{
> 	task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
> 
> 	if (!task)
> 	    {
> 	    err = psos_handle_error(tid,PSOS_TASK_MAGIC,psostask_t);
> 	    goto unlock_and_exit;
> 	    }
> 	}
264c288,300
<     task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
---
> //    task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
>     if (tid == 0)/*Add by AB*/
> 	task = psos_current_task();
>     else
> 	{
> 	task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
> 
> 	if (!task)
> 	    {
> 	    err = psos_handle_error(tid,PSOS_TASK_MAGIC,psostask_t);
> 	    goto unlock_and_exit;
> 	    }
> 	}
351c387,398
<     task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
---
>    if (tid == 0)/*Add by AB*/
> 	task = psos_current_task();
>     else
> 	{
> 	task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
> 
> 	if (!task)
> 	    {
> 	    err = psos_handle_error(tid,PSOS_TASK_MAGIC,psostask_t);
> 	    goto unlock_and_exit;
> 	    }
> 	}
383c430,442
<     task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
---
> //    task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
>     if (tid == 0)/*Add by AB*/
> 	task = psos_current_task();
>     else
> 	{
> 	task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
> 
> 	if (!task)
> 	    {
> 	    err = psos_handle_error(tid,PSOS_TASK_MAGIC,psostask_t);
> 	    goto unlock_and_exit;
> 	    }
> 	}
424c483,495
<     task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
---
>     //    task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
>     if (tid == 0)/*Add by AB*/
> 	task = psos_current_task();
>     else
> 	{
> 	task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
> 
> 	if (!task)
> 	    {
> 	    err = psos_handle_error(tid,PSOS_TASK_MAGIC,psostask_t);
> 	    goto unlock_and_exit;
> 	    }
> 	}
505c576
<     spl_t s;
---
>     spl_t s;				
509c580,593
<     task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
---
>   
> //    task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
>     if (tid == 0)/*Add by AB*/
> 	task = psos_current_task();
>     else
> 	{
> 	task = psos_h2obj_active(tid,PSOS_TASK_MAGIC,psostask_t);
> 
> 	if (!task)
> 	    {
> 	    err = psos_handle_error(tid,PSOS_TASK_MAGIC,psostask_t);
> 	    goto unlock_and_exit;
> 	    }
> 	}



-----Message d'origine-----
De : jan.kiszka@domain.hid [mailto:jan.kiszka@domain.hid]
Envoyé : mardi 4 juillet 2006 15:46
À : Antoine.BRUGEAS@fr.thalesgroup.com
Cc : Xenomai-help@domain.hid
Objet : Re: [Xenomai-help] Modification of the PSOS skin.


Antoine.BRUGEAS@fr.thalesgroup.com wrote:
> hello,
> 
> Xenomai is under the GPL license, and I think that I have to
> redistribute the source code when I modify or add something on it.
> But, I don't know how to process to distribute the source code. Then,
> I give you modifications in this mailing list.
> 

In general, publication of your patches is required when you give
binaries to some third party. In-house use doesn't require this by law.
Nevertheless, we can only encourage anyone to follow your good example
and send us improvements! You will gain feedback and make sure that
future versions will already contain your patches.

Just a hint on the preferred patch format: either generate a diff of
individual modified files by invoking "diff -up file file.orig >>
my.patch" or - even easier - check out the subversion repository (see
https://gna.org/svn/?group=xenomai for details), change your files and
run "svn diff > my.patch". This makes it easier to review the
differences and integrate them in the tree.

Sorry, I cannot comment on code details, but I'm sure others will.

Thanks,
Jan

Re: [Xenomai-help] Modification of the PSOS skin. [update]

[Romain Lenglet]

Jan Kiska wrote:
> Just a hint on the preferred patch format: either generate a
> diff of individual modified files by invoking "diff -up file
> file.orig >> my.patch" or

Just to be picky, the original file is the 1st argument, and the 
modified file the 2nd one:
diff ... file.orig file

And traditionally, people rather use the "normalized" diff 
format. This is the one recommended in the patch(1) manpage. I 
personally like the following diff options:

diff -Naurd file.orig file

Mnemotechnic tip: Naurd == Nerd ;-)

-- 
Romain LENGLET

Re: [Xenomai-help] Modification of the PSOS skin. [update]

[Jan Kiszka]

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

Antoine.BRUGEAS@fr.thalesgroup.com wrote:
> Result of the diff command :

[skipping and acknowledging what Romain already remarked]

Your patch is small, so manual fixing during merge is no big issue here.
But for larger patches a cleanup would be good, i.e. removing of dead
code etc.

And for crediting your work you may provide a patch for ChangeLog
(instead of the adding this as comment to the code). If not we would add
it on commit.

Jan


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

Re: [Xenomai-help] Modification of the PSOS skin. [update]

[Romain Lenglet]

Jan Kiszka wrote:
> Antoine.BRUGEAS@fr.thalesgroup.com wrote:
> > Result of the diff command :
>
> [skipping and acknowledging what Romain already remarked]
>
> Your patch is small, so manual fixing during merge is no big
> issue here. But for larger patches a cleanup would be good,
> i.e. removing of dead code etc.
>
> And for crediting your work you may provide a patch for
> ChangeLog (instead of the adding this as comment to the code).
> If not we would add it on commit.

And don't forget an entry in the CREDITS! :-)

-- 
Romain LENGLET

[Xenomai-core] RE: [Xenomai-help] Modification of the PSOS skin. [update]

[Philippe Gerum]

On Wed, 2006-07-05 at 13:46 +0200, Antoine.BRUGEAS@fr.thalesgroup.com
wrote:
> Result of the diff command :
> 

Please always run the diff command with the -u option enabled to build
patches, it's a mandatory format for any code to be reviewed and later
merged. This said, I've committed the few checks for self-directed calls
your second patch adds to the trunk. Thanks.

> *************************for psos.h
> 
> 321a322
> > #define ERR_SSFN     0x03     /* Illegal system service function number */
> 325a327
> > #define ERR_OBJTFULL 0x08     /* Node's Object table full */

-- 
Philippe.