[Netadm-devel] gwc/pf pf.c,1.13,1.14 sysklog.c,1.6,1.7

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/netadm/gwc/pf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20195

Modified Files:
	pf.c sysklog.c 
Log Message:
FIX: idx lookup exception & log format.

Index: pf.c
===================================================================
RCS file: /cvsroot/netadm/gwc/pf/pf.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** pf.c	8 May 2006 07:05:59 -0000	1.13
--- pf.c	9 May 2006 16:01:52 -0000	1.14
***************
*** 167,174 ****
    int             i;

!   /* TODO : remove me */
! #if 1
!   gwc_printk (GWC_KSYS_IDX, "This is KSYS test, gwc_ksys.log .. remove this debug code\n");
! #endif
    for( i = 0; i <= blk_hash_mask; i++){

--- 167,172 ----
    int             i;

!   /* TODO : gwc_printk  test code: default: on remove me ! */
!   gwc_printk (GWC_PF_IDX , "This is PF test, gwc_pf.log .. remove this debug code\n");
    for( i = 0; i <= blk_hash_mask; i++){

***************
*** 182,188 ****
    }
    /* TODO : remove me */
! #if 1
!   gwc_printk (GWC_PF_IDX , "This is PF test, gwc_pf.log .. remove this debug code\n");
! #endif

    return 1;
--- 180,184 ----
    }
    /* TODO : remove me */
!   gwc_printk (GWC_KSYS_IDX, "This is KSYS test, gwc_ksys.log .. remove this debug code\n");

    return 1;

Index: sysklog.c
===================================================================
RCS file: /cvsroot/netadm/gwc/pf/sysklog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sysklog.c	8 May 2006 16:53:27 -0000	1.6
--- sysklog.c	9 May 2006 16:01:52 -0000	1.7
***************
*** 78,82 ****
      char	  *devname;
  };
- 
  static struct gwcklog_chrdev gwcklog_chrdevtab [MAXSYSIDX];

--- 78,81 ----
***************
*** 90,103 ****
      int log_buf_len;
      unsigned long logged_chars;
!     
      spinlock_t logbuf_lock;
      spinlock_t ratelimit_lock;
-     
      wait_queue_head_t log_wait;
!     
      unsigned long last_msg;
-     
      unsigned long toks;
-     
      int missed;

--- 89,99 ----
      int log_buf_len;
      unsigned long logged_chars;
!    
      spinlock_t logbuf_lock;
      spinlock_t ratelimit_lock;
      wait_queue_head_t log_wait;
! 
      unsigned long last_msg;
      unsigned long toks;
      int missed;

***************
*** 108,118 ****

  static inline int get_gwcklog_idx (const char *devname) {
!     int i = -1;

!     for (i = 0; i < gwcklog_chrdevtab_slot; i++)
! 	if ( !strcmp (gwcklog_chrdevtab [i].devname, devname))
! 	    break;

!     return i;
  }

--- 104,116 ----

  static inline int get_gwcklog_idx (const char *devname) {
!     int i;

!     for (i = 0; i < gwcklog_chrdevtab_slot; i++) {
! 	if ( !strcmp (gwcklog_chrdevtab [i].devname, devname)) {
! 	    return i;
! 	}
!     }

!     return -1;
  }

***************
*** 426,434 ****
  				unsigned long long t;
  				unsigned long nanosec_rem;
! /***********************************************************************************/
! /* TODO:
!  * force the log level token to be
!  * before the time output.
!  * *********************************************************************************/
  				if (p[0] == '<' && p[1] >='0' &&
  				   p[1] <= '9' && p[2] == '>') {
--- 424,433 ----
  				unsigned long long t;
  				unsigned long nanosec_rem;
! 
! #if 0				/* TODO: *******************************************/
! 				/*						   */
! 				/*	setup <format>				   */
! 				/*						   */
! 				/***************************************************/
  				if (p[0] == '<' && p[1] >='0' &&
  				   p[1] <= '9' && p[2] == '>') {
***************
*** 440,443 ****
--- 439,444 ----
  						+ '0';
  				}
+ #endif
+ 				loglev_char = 'G';
  				t = gwc_printk_clock();
  				nanosec_rem = do_div(t, 1000000000);
***************
*** 521,525 ****
  static int gwcklog_generic_open(struct inode * inode, struct file * file)
  {
!     int idx = get_gwcklog_idx ( file->f_dentry->d_iname );
      if ( idx < 0 )
  	return -ENXIO;
--- 522,533 ----
  static int gwcklog_generic_open(struct inode * inode, struct file * file)
  {
!     int idx;
! 		
!     if ((file->f_flags & O_ACCMODE) & (O_WRONLY | O_RDWR)) {
! 	printk ("%s: Device does not allow writing mode\n", gwc_klog_driver_name);
! 	return -EROFS;
!     }
! 
!     idx = get_gwcklog_idx ( file->f_dentry->d_iname );
      if ( idx < 0 )
  	return -ENXIO;
***************
*** 575,579 ****

      if (gwcklog_chrdevtab_slot + MINGWCLOG_MAJORNUM > MAXGWCLOG_MAJORNUM ) {
! 	printk (KERN_ERR "chrdevtab overflow\n");
  	return -EMFILE;
      }
--- 583,587 ----

      if (gwcklog_chrdevtab_slot + MINGWCLOG_MAJORNUM > MAXGWCLOG_MAJORNUM ) {
! 	printk (KERN_ERR "%s: chrdevtab overflow\n", gwc_klog_driver_name);
  	return -EMFILE;
      }
***************
*** 585,592 ****

      if (!gwcklog_chrdevtab [gwcklog_chrdevtab_slot].devname) {
! 	printk (KERN_ERR "Failed to alloc mem\n");
  	return -ENOMEM;
      }
- 
      strcpy (gwcklog_chrdevtab [gwcklog_chrdevtab_slot].devname, devname);

--- 593,599 ----

      if (!gwcklog_chrdevtab [gwcklog_chrdevtab_slot].devname) {
! 	printk (KERN_ERR "%s: Failed to alloc mem\n", gwc_klog_driver_name);
  	return -ENOMEM;
      }
      strcpy (gwcklog_chrdevtab [gwcklog_chrdevtab_slot].devname, devname);

***************
*** 594,598 ****
  			   gwcklog_chrdevtab [gwcklog_chrdevtab_slot].devname,
  			   &gwcklog_generic_operations)) < 0 ) {
! 	printk ("Failed to register gwc chrdev [%s]: %d\n", 
  		gwcklog_chrdevtab [gwcklog_chrdevtab_slot].devname, ret);
  	kfree (gwcklog_chrdevtab [gwcklog_chrdevtab_slot].devname);
--- 601,606 ----
  			   gwcklog_chrdevtab [gwcklog_chrdevtab_slot].devname,
  			   &gwcklog_generic_operations)) < 0 ) {
! 	printk ("%s: Failed to register gwc chrdev [%s]: %d\n", 
! 		gwc_klog_driver_name,
  		gwcklog_chrdevtab [gwcklog_chrdevtab_slot].devname, ret);
  	kfree (gwcklog_chrdevtab [gwcklog_chrdevtab_slot].devname);
***************
*** 609,613 ****

      if (gwcklog_chrdevtab_slot - 1 < 0 ) {
! 	printk (KERN_ERR "gwcklog_chrdevtab underflow\n");
  	return -ENODEV;
      }
--- 617,621 ----

      if (gwcklog_chrdevtab_slot - 1 < 0 ) {
! 	printk (KERN_ERR "%s: gwcklog_chrdevtab underflow\n", gwc_klog_driver_name);
  	return -ENODEV;
      }
***************
*** 698,702 ****
  gwc_klog_init(void) {

!     printk (KERN_INFO "Registering %s-%s ...\n",
  		gwc_klog_driver_name, 
  		gwc_klog_driver_version);
--- 706,711 ----
  gwc_klog_init(void) {

!     printk (KERN_INFO "%s: Registering %s-%s ...\n",
! 		gwc_klog_driver_name, 
  		gwc_klog_driver_name, 
  		gwc_klog_driver_version);
***************
*** 712,716 ****
  gwc_klog_exit(void)
  {
!     printk (KERN_INFO "Unregistering %s-%s ...\n",
  		gwc_klog_driver_name, 
  		gwc_klog_driver_version);
--- 721,726 ----
  gwc_klog_exit(void)
  {
!     printk (KERN_INFO "%s: Unregistering %s-%s ...\n",
! 		gwc_klog_driver_name, 
  		gwc_klog_driver_name, 
  		gwc_klog_driver_version);