Menu
▾
▴
[Contiki-commits] [contiki-os/contiki] 1895d3: Fixed severe bug in PSOCK_READTO (?)
|
From: Oliver S. <ol...@we...> - 2013-02-14 15:02:38
|
Branch: refs/heads/master Home: https://github.com/contiki-os/contiki Commit: 1895d3a959982e6a9b1bcae177a4135e4244f71a https://github.com/contiki-os/contiki/commit/1895d3a959982e6a9b1bcae177a4135e4244f71a Author: Oliver Schmidt <oli...@us...> Date: 2013-02-09 (Sat, 09 Feb 2013) Changed paths: M core/net/psock.c Log Message: ----------- Fixed severe bug in PSOCK_READTO (?) Either I found and fixed a severe bug in PSOCK_READTO() or I misunderstood something completely. To me PSOCK_READTO() is supposed to return if either the supplied character was read or if the user supplied buffer is exhausted - sor far so good. However if the latter occurs up to now PSOCK_READTO() was continuing to process characters already read from the network (aka present in the uIP buffer) in order to check if the supplied character was found there and adjust the return value accordingly. But this means that the character processed this way were lost forever for the caller as the next call to PSOCK_READTO() would continue to read past the characters processed this way. Therefore I removed that character processing altogether. So now if the user supplied buffer is exhausted before the supplied character is found the next call to PSOCK_READTO() starts exactly where previous call left off. Commit: 1eda821a756a8fc1ca256d14bbe259b38113b258 https://github.com/contiki-os/contiki/commit/1eda821a756a8fc1ca256d14bbe259b38113b258 Author: Oliver Schmidt <oli...@us...> Date: 2013-02-10 (Sun, 10 Feb 2013) Changed paths: M core/net/psock.c Log Message: ----------- Fixed severe bug in PSOCK_READTO (?) Either I found and fixed a severe bug in PSOCK_READTO() or I misunderstood something completely. To me PSOCK_READTO() is supposed to return if either the supplied character was read or if the user supplied buffer is exhausted - sor far so good. However if the latter occurs up to now PSOCK_READTO() was continuing to process characters already read from the network (aka present in the uIP buffer) in order to check if the supplied character was found there and adjust the return value accordingly. But this means that the character processed this way were lost forever for the caller as the next call to PSOCK_READTO() would continue to read past the characters processed this way. Therefore I removed that character processing altogether. So now if the user supplied buffer is exhausted before the supplied character is found the next call to PSOCK_READTO() starts exactly where previous call left off. Commit: 1af511094651a56c4b2ac6372e5c211a1572a508 https://github.com/contiki-os/contiki/commit/1af511094651a56c4b2ac6372e5c211a1572a508 Author: Oliver Schmidt <oli...@us...> Date: 2013-02-10 (Sun, 10 Feb 2013) Log Message: ----------- Merge remote-tracking branch 'refs/remotes/origin/master' Commit: ea4fac679fd65a66e05095c0e656e0c73abf093b https://github.com/contiki-os/contiki/commit/ea4fac679fd65a66e05095c0e656e0c73abf093b Author: Oliver Schmidt <oli...@us...> Date: 2013-02-10 (Sun, 10 Feb 2013) Changed paths: M examples/wget/wget.c Log Message: ----------- Allow user to read the result of wget. Several retro targets clear the screen after program termination so allow user to read the result. Commit: c385dd13937facdd618addac72f306eb9b1ac27a https://github.com/contiki-os/contiki/commit/c385dd13937facdd618addac72f306eb9b1ac27a Author: Oliver Schmidt <oli...@us...> Date: 2013-02-10 (Sun, 10 Feb 2013) Changed paths: M Makefile.include Log Message: ----------- Be consistent with tab chars in Makefiles. Commit: 98060c1eab2abf45d11a6bb2195c59aacdb259b9 https://github.com/contiki-os/contiki/commit/98060c1eab2abf45d11a6bb2195c59aacdb259b9 Author: Oliver Schmidt <oli...@us...> Date: 2013-02-14 (Thu, 14 Feb 2013) Changed paths: M cpu/6502/Makefile.6502 M platform/apple2enh/Makefile.apple2enh M platform/atari/Makefile.atari R platform/atari/lib/posixdirent.S M platform/c128/Makefile.c128 R platform/c128/cfs/cfs-cbm-dir.c M platform/c128/lib/pfs.S M platform/c64/Makefile.c64 R platform/c64/cfs/cfs-cbm-dir.c M platform/c64/lib/pfs.S Log Message: ----------- Moved from last cc65 release (2.13.3) to recent cc65 snapshot (2.13.9). Relevant cc65 changes... General: - The compiler generates "extended" dependency info (like gcc) so there's no need for postprocessing whatsoever :-) - The linker is very pernickety regarding the ordering of cmdline options so a custom linker rule is necessary :-( Apple2: - The various memory usage scenarios aren't specified anymore via separate linker configs but via defines overriding default values in the builtin linker config. Atari: - The builtin linker config allows to override the start addr so there no more need for a custom linker config. - The C library comes with POSIX directory access. So there's no more need for for a custom coding. CBM: - The C library comes with POSIX directory access. So there's no more need for for a custom coding. Commit: 107b79c0193c604b8c47ef1593493ed999b7172d https://github.com/contiki-os/contiki/commit/107b79c0193c604b8c47ef1593493ed999b7172d Author: Oliver Schmidt <oli...@us...> Date: 2013-02-14 (Thu, 14 Feb 2013) Changed paths: M examples/webbrowser/Makefile.atari.defines Log Message: ----------- The recent cc65 snapshot yields somewhat small programs so we can move back to the MTU size used before. Commit: 9040f83fd42d45c7a591bdc45a17676ff2deb888 https://github.com/contiki-os/contiki/commit/9040f83fd42d45c7a591bdc45a17676ff2deb888 Author: Oliver Schmidt <oli...@us...> Date: 2013-02-14 (Thu, 14 Feb 2013) Changed paths: M examples/ftp/Makefile.c128.defines Log Message: ----------- Reduced program size. On the C128 the custom PFS code doesn't add functionality (as it does with IDE64 support on the C64) but is "only" smaller than the POSIX file i/o code in the C library. But the POSIX directory access code in the C library relies on the POSIX file i/o code anyway so there no point in additionally adding the PFS code to the FTP program. Commit: 90186b035d6ce2f8607280627f36b4ad5897b7dc https://github.com/contiki-os/contiki/commit/90186b035d6ce2f8607280627f36b4ad5897b7dc Author: Oliver Schmidt <ol...@we...> Date: 2013-02-14 (Thu, 14 Feb 2013) Changed paths: M Makefile.include M core/net/psock.c M cpu/6502/Makefile.6502 M examples/ftp/Makefile.c128.defines M examples/webbrowser/Makefile.atari.defines M examples/wget/wget.c M platform/apple2enh/Makefile.apple2enh M platform/atari/Makefile.atari R platform/atari/lib/posixdirent.S M platform/c128/Makefile.c128 R platform/c128/cfs/cfs-cbm-dir.c M platform/c128/lib/pfs.S M platform/c64/Makefile.c64 R platform/c64/cfs/cfs-cbm-dir.c M platform/c64/lib/pfs.S Log Message: ----------- Merge pull request #123 from oliverschmidt/master Without anybody putting in a veto in the meantime it seems appropriate to merge now... Compare: https://github.com/contiki-os/contiki/compare/19c8f9ffdde8...90186b035d6c |