search

alexlee188 / ghpsdr3-alex

Modifications of John Melton's ghpsdr3
GNU General Public License v3.0
64 stars 38 forks source link

Various changes to the client interaction in dspserver. #12

Closed eblanton closed 12 years ago

eblanton commented 12 years ago

I think this is ready for merge. There may be more changes later, but I don't see any reason to hold this up. I've been running it for days with no trouble, and Ken also reports success.

frohro commented 12 years ago

Hi Ethan,

I did the pull below and it seems good to me. Alex added you to the collaborators, didn't he? I suggest you push to master. All the changes you have made seem just what we need. Thanks for taking this work on. We really appreciate the help cleaning up the code. And I for one really appreciate your tutorial comments that help us all to write better code.

Thanks!

Rob

On 02/25/2012 07:05 PM, Ethan Blanton wrote:

I think this is ready for merge. There may be more changes later, but I don't see any reason to hold this up. I've been running it for days with no trouble, and Ken also reports success.

You can merge this Pull Request by running:

git pull https://github.com/eblanton/ghpsdr3-alex master

Or you can view, comment on it, or merge it online at:

https://github.com/alexlee188/ghpsdr3-alex/pull/12

-- Commit Summary --

  • add debugging functions
  • reformat readcb
  • Fix up Makefile.am
  • Merge commit 'aba8747378a6e89267cf892282d4d5ade78f36e0' into elb-dspserver-comms
  • Fix up util.c errors
  • Move some debug statements over to the log facility
  • Remove one layer of indentation from most of readcb
  • Remove master/slave duplication in readcb, other simplifications
  • Fix inadvertent shadow of token from aborted refactor
  • Ensure that all reads are 64 bytes in readcb
  • Initialize current_item to NULL to silence warning
  • client_thread and related cleanups
  • Clean up do_accept
  • reduce scope of a variable in readcb
  • This really should be strcmp, we want an exact match
  • errorcb cleanup
  • Get rid of memory thread, bufferevent_write copies data
  • cut standard message over to logging function
  • Kill a few more inet_ntoa instances
  • Fix race in status update
  • unfortunate typo
  • make client sockets CLOEXEC
  • use threadsafe bufferevent functions in libevent
  • formatting comment for client.c
  • Shorten critical section in dspserver writecb()
  • Merge branch 'elb-dspserver-comms'

-- File Changes --

M configure.ac (17) M trunk/src/dspserver/Makefile.am (4) M trunk/src/dspserver/client.c (1609) M trunk/src/dspserver/register.c (27) A trunk/src/dspserver/util.c (40) A trunk/src/dspserver/util.h (26)

-- Patch Links --

https://github.com/alexlee188/ghpsdr3-alex/pull/12.patch https://github.com/alexlee188/ghpsdr3-alex/pull/12.diff

Reply to this email directly or view it on GitHub: https://github.com/alexlee188/ghpsdr3-alex/pull/12

Rob Frohne, Ph.D., P.E. E.F. Cross School of Engineering Walla Walla University 100 SW 4th Street College Place, WA 99324 (509) 527-2075 http://people.wallawalla.edu/~rob.frohne

frohro commented 12 years ago

Hi Ethan,

After further testing I am having issues with "No space left to write in jack ringbuffers.\n" coming from line 310 in client.c. I haven't seen these before. I will have to try and sort it out.

73,

Rob

On 02/25/2012 07:05 PM, Ethan Blanton wrote:

I think this is ready for merge. There may be more changes later, but I don't see any reason to hold this up. I've been running it for days with no trouble, and Ken also reports success.

You can merge this Pull Request by running:

git pull https://github.com/eblanton/ghpsdr3-alex master

Or you can view, comment on it, or merge it online at:

https://github.com/alexlee188/ghpsdr3-alex/pull/12

-- Commit Summary --

  • add debugging functions
  • reformat readcb
  • Fix up Makefile.am
  • Merge commit 'aba8747378a6e89267cf892282d4d5ade78f36e0' into elb-dspserver-comms
  • Fix up util.c errors
  • Move some debug statements over to the log facility
  • Remove one layer of indentation from most of readcb
  • Remove master/slave duplication in readcb, other simplifications
  • Fix inadvertent shadow of token from aborted refactor
  • Ensure that all reads are 64 bytes in readcb
  • Initialize current_item to NULL to silence warning
  • client_thread and related cleanups
  • Clean up do_accept
  • reduce scope of a variable in readcb
  • This really should be strcmp, we want an exact match
  • errorcb cleanup
  • Get rid of memory thread, bufferevent_write copies data
  • cut standard message over to logging function
  • Kill a few more inet_ntoa instances
  • Fix race in status update
  • unfortunate typo
  • make client sockets CLOEXEC
  • use threadsafe bufferevent functions in libevent
  • formatting comment for client.c
  • Shorten critical section in dspserver writecb()
  • Merge branch 'elb-dspserver-comms'

-- File Changes --

M configure.ac (17) M trunk/src/dspserver/Makefile.am (4) M trunk/src/dspserver/client.c (1609) M trunk/src/dspserver/register.c (27) A trunk/src/dspserver/util.c (40) A trunk/src/dspserver/util.h (26)

-- Patch Links --

https://github.com/alexlee188/ghpsdr3-alex/pull/12.patch https://github.com/alexlee188/ghpsdr3-alex/pull/12.diff

Reply to this email directly or view it on GitHub: https://github.com/alexlee188/ghpsdr3-alex/pull/12

Rob Frohne, Ph.D., P.E. E.F. Cross School of Engineering Walla Walla University 100 SW 4th Street College Place, WA 99324 (509) 527-2075 http://people.wallawalla.edu/~rob.frohne

frohro commented 12 years ago

And now I can't make it happen again. It appears I need to do something like I did with the jack side, and not print out every time, so debugging is easier.

73,

Rob

On 02/25/2012 07:05 PM, Ethan Blanton wrote:

I think this is ready for merge. There may be more changes later, but I don't see any reason to hold this up. I've been running it for days with no trouble, and Ken also reports success.

You can merge this Pull Request by running:

git pull https://github.com/eblanton/ghpsdr3-alex master

Or you can view, comment on it, or merge it online at:

https://github.com/alexlee188/ghpsdr3-alex/pull/12

-- Commit Summary --

  • add debugging functions
  • reformat readcb
  • Fix up Makefile.am
  • Merge commit 'aba8747378a6e89267cf892282d4d5ade78f36e0' into elb-dspserver-comms
  • Fix up util.c errors
  • Move some debug statements over to the log facility
  • Remove one layer of indentation from most of readcb
  • Remove master/slave duplication in readcb, other simplifications
  • Fix inadvertent shadow of token from aborted refactor
  • Ensure that all reads are 64 bytes in readcb
  • Initialize current_item to NULL to silence warning
  • client_thread and related cleanups
  • Clean up do_accept
  • reduce scope of a variable in readcb
  • This really should be strcmp, we want an exact match
  • errorcb cleanup
  • Get rid of memory thread, bufferevent_write copies data
  • cut standard message over to logging function
  • Kill a few more inet_ntoa instances
  • Fix race in status update
  • unfortunate typo
  • make client sockets CLOEXEC
  • use threadsafe bufferevent functions in libevent
  • formatting comment for client.c
  • Shorten critical section in dspserver writecb()
  • Merge branch 'elb-dspserver-comms'

-- File Changes --

M configure.ac (17) M trunk/src/dspserver/Makefile.am (4) M trunk/src/dspserver/client.c (1609) M trunk/src/dspserver/register.c (27) A trunk/src/dspserver/util.c (40) A trunk/src/dspserver/util.h (26)

-- Patch Links --

https://github.com/alexlee188/ghpsdr3-alex/pull/12.patch https://github.com/alexlee188/ghpsdr3-alex/pull/12.diff

Reply to this email directly or view it on GitHub: https://github.com/alexlee188/ghpsdr3-alex/pull/12

Rob Frohne, Ph.D., P.E. E.F. Cross School of Engineering Walla Walla University 100 SW 4th Street College Place, WA 99324 (509) 527-2075 http://people.wallawalla.edu/~rob.frohne

eblanton commented 12 years ago

As far as I know, I do not have commit access to the master repository.

I don't really understand the jack error; dspserver doesn't use jack at all. (That's not to say it might not change timings in such a way as to stuff up softrock or widget-server or whatever.)

frohro commented 12 years ago

Hi Ethan,

Have a look at this page https://github.com/alexlee188/ghpsdr3-alex/network/members. I think you have commit access.

73,

Rob

On 02/26/2012 06:54 AM, Ethan Blanton wrote:

As far as I know, I do not have commit access to the master repository.

I don't really understand the jack error; dspserver doesn't use jack at all. (That's not to say it might not change timings in such a way as to stuff up softrock or widget-server or whatever.)

Reply to this email directly or view it on GitHub: https://github.com/alexlee188/ghpsdr3-alex/pull/12#issuecomment-4181672

Rob Frohne, Ph.D., P.E. E.F. Cross School of Engineering Walla Walla University 100 SW 4th Street College Place, WA 99324 (509) 527-2075 http://people.wallawalla.edu/~rob.frohne

eblanton commented 12 years ago

Rob Frohne spake unto us the following wisdom:

Have a look at this page https://github.com/alexlee188/ghpsdr3-alex/network/members. I think you have commit access.

That just shows forks that have been fed back in, I think. https://github.com/alexlee188/ghpsdr3-alex/ says read-only for me.

Ethan

eblanton commented 12 years ago

Alex just added me, so I merged it.

frohro commented 12 years ago

Good!

Rob

On 02/26/2012 09:38 AM, Ethan Blanton wrote:

Alex just added me, so I merged it.

Reply to this email directly or view it on GitHub: https://github.com/alexlee188/ghpsdr3-alex/pull/12#issuecomment-4182877

Rob Frohne, Ph.D., P.E. E.F. Cross School of Engineering Walla Walla University 100 SW 4th Street College Place, WA 99324 (509) 527-2075 http://people.wallawalla.edu/~rob.frohne