Changeset 4055:00addfba7e7f in roaraudio

Timestamp:

07/15/10 15:19:40 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

adding some more ROAR_INFO()s

Location:

roard

Files:

• roard.c (modified) (8 diffs)
• signals.c (modified) (4 diffs)

roard/roard.c

@@ -245 +245 @@
  int ok;
 
+ ROAR_INFO("restart_server(server='%s', terminate=%i): trying to restart server", ROAR_DBG_INFO_INFO, server, terminate);
+
  if ( pidfile != NULL ) {
   if ( roar_vio_open_file(&fh, pidfile, O_RDONLY, 0644) == -1 ) {
@@ -512 +514 @@
  int    i;
 
+ ROAR_INFO("add_listen(addr='%s', port=%i, sock_type=%i, user='%s', group='%s', proto=%s(%i), dir=%s(%i), info={.rate=%u, .bits=%u, .channels=%u, .codec=%s(%u)}): trying to add listen socket",
+            ROAR_DBG_INFO_INFO,
+            addr, port, sock_type, user, group, roar_proto2str(proto), proto, roar_dir2str(dir), dir,
+            info->rate, info->bits, info->channels, roar_codec2str(info->codec), info->codec);
+
  if ( *addr != 0 ) {
   for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
@@ -701 +708 @@
  float q = -32e6;
 
- ROAR_DBG("add_output(drv='%s', dev='%s', opts='%s') = ?", drv, dev, opts);
+ ROAR_INFO("add_output(drv='%s', dev='%s', opts='%s', prim=%i, count=%i): trying to add output driver", ROAR_DBG_INFO_INFO, drv, dev, opts, prim, count);
 
  if ( drv == NULL && count == 0 ) {
@@ -1860 +1867 @@
  add_output(o_drv, o_dev, o_opts, o_prim, o_count);
 
- ROAR_DBG("Server config: rate=%i, bits=%i, chans=%i", sa.rate, sa.bits, sa.channels);
+ ROAR_INFO("Server config: rate=%i, bits=%i, chans=%i", ROAR_DBG_INFO_NOTICE, sa.rate, sa.bits, sa.channels);
 
  if ( waveform_init() == -1 ) {
@@ -2098 +2105 @@
 
  // start main loop...
+ ROAR_INFO("Entering main loop", ROAR_DBG_INFO_INFO);
  main_loop(drvid, drvinst, &sa, sysclocksync);
+ ROAR_INFO("Left main loop", ROAR_DBG_INFO_INFO);
 
  // clean up.
@@ -2105 +2114 @@
  output_buffer_free();
 
+ ROAR_INFO("Exiting, no error", ROAR_DBG_INFO_INFO);
  return 0;
 }
@@ -2110 +2120 @@
 void cleanup_listen_socket (int terminate) {
  int i;
+
+ ROAR_DBG("cleanup_listen_socket(terminate=%i) = (void)?", terminate);
+
+ ROAR_INFO("Cleaning up listen sockets", ROAR_DBG_INFO_INFO);
 
  // Deregister from SLP:
@@ -2176 +2190 @@
 
 void clean_quit (void) {
+ ROAR_INFO("Shuting down", ROAR_DBG_INFO_INFO);
+
  clean_quit_prep();
 // driver_close(drvinst, drvid);
 // output_buffer_free();
+
+ ROAR_INFO("Exiting, no error", ROAR_DBG_INFO_INFO);
  exit(0);
 }

roard/signals.c

@@ -31 +31 @@
 
 void on_sig_int (int signum) {
- ROAR_DBG("got SIGINT");
+ ROAR_INFO("got SIGINT", ROAR_DBG_INFO_NOTICE);
 
  // TODO: implement some kind of termonate/force depending on how many ^Cs we get
@@ -38 +38 @@
 
 void on_sig_term (int signum) {
- ROAR_DBG("got SIGTERM (or called by SIGINT handler)");
+ ROAR_INFO("got SIGTERM (or called by SIGINT handler)", ROAR_DBG_INFO_NOTICE);
 
  alive = 0;
@@ -45 +45 @@
 
 void on_sig_chld (int signum) {
- ROAR_DBG("got SIGCHLD");
+ ROAR_INFO("got SIGCHLD", ROAR_DBG_INFO_NOTICE);
 
  wait(NULL);
@@ -53 +53 @@
 
 void on_sig_usr1 (int signum) {
- ROAR_DBG("got SIGUSR1");
+ ROAR_INFO("got SIGUSR1", ROAR_DBG_INFO_NOTICE);
 
  cleanup_listen_socket(1);