From: <ro...@us...> - 2010-07-23 14:52:37
|
Revision: 2342 http://nscldaq.svn.sourceforge.net/nscldaq/?rev=2342&view=rev Author: ron-fox Date: 2010-07-23 14:52:31 +0000 (Fri, 23 Jul 2010) Log Message: ----------- ensure this all works on etch tool Modified Paths: -------------- branches/daqclients-8_2/clients/CHANGELOG branches/daqclients-8_2/clients/ScalerDisplay/Makefile.am branches/daqclients-8_2/clients/Stager/Monitor.tcl branches/daqclients-8_2/clients/btdriver2.6/dd/btp.mod.c branches/daqclients-8_2/clients/btdriver2.6/dd/btp_cfg.c branches/daqclients-8_2/clients/configure.in Modified: branches/daqclients-8_2/clients/CHANGELOG =================================================================== --- branches/daqclients-8_2/clients/CHANGELOG 2010-07-23 13:30:26 UTC (rev 2341) +++ branches/daqclients-8_2/clients/CHANGELOG 2010-07-23 14:52:31 UTC (rev 2342) @@ -1092,4 +1092,8 @@ CopyOut not bumping the buffer pointer. Edit level 007 - January 15, 2010 Exit ReadoutGui with destroy . as exit seems to hang - reaping children in some systems. \ No newline at end of file + reaping children in some systems. +- January 19, 2010 Turn off monitor bar. +Edit level 008 +- March 22, 2010 Add a log script for the scaler display that will log all + channels. Modified: branches/daqclients-8_2/clients/ScalerDisplay/Makefile.am =================================================================== (Binary files differ) Modified: branches/daqclients-8_2/clients/Stager/Monitor.tcl =================================================================== --- branches/daqclients-8_2/clients/Stager/Monitor.tcl 2010-07-23 13:30:26 UTC (rev 2341) +++ branches/daqclients-8_2/clients/Stager/Monitor.tcl 2010-07-23 14:52:31 UTC (rev 2342) @@ -32,7 +32,7 @@ # dismiss and destruction of the toplevel will invoke a -destroy # callback if defined. # -snit::widget detailsMonitor { +snit::widget detailsMonitorWorking { hulltype toplevel variable afterId -1 @@ -106,7 +106,7 @@ # bring up the detailed status widget. The widget # auto updates every 2 seconds or so. # -snit::widget spdaqMonitor { +snit::widget spdaqMonitorWorking { variable afterId -1 variable details false @@ -155,3 +155,96 @@ } } +#---------------- stubs status display +# The status display is stubbed because: +# - There's several 100ms of dead time each update. +# - The connection thrashing seems to be something that can kill +# spectrodaq if you keep it up long enough. +# + + + + +# This file contains code that manages a status display of the +# spectrodaq page usage for the readout GUI. We look like +# pair of megawidgets, but only the spdaqMonitor widget should be +# used as it has a button that will bring up the spdaqUsage widget. +# + +package provide spdaqMonitor 1.0 +package require snit +package require spdaqwidgets + + +#-------------------------------------------------------------------- +# +# This widget provides a detailed status widget in a toplevel +# with some titling information, and a dimsiss box. +# dismiss and destruction of the toplevel will invoke a -destroy +# callback if defined. +# +snit::widget detailsMonitor { + hulltype toplevel + + variable afterId -1 + + option -host localhost + option -destroy {} + + + + + method update {} { + + } + method onDismiss {} { + + } + method onDestroy widget { + + } + onconfigure -host host { + + } + constructor args { + } + + destructor { + } +} + + +#-------------------------------------------------------------------- +# +# This widget provides a spectrodaq status strip. The strip +# consists of some text that describes the source host +# a freepage graph of that host and a button that will +# bring up the detailed status widget. The widget +# auto updates every 2 seconds or so. +# +snit::widget spdaqMonitor { + variable afterId -1 + variable details false + + option -host localhost + + + constructor args { + } + + destructor { + + } + + onconfigure -host host { + + } + method update {} { + } + method showDetails {} { + + } + method onDetailsGone {} { + } + +} Modified: branches/daqclients-8_2/clients/btdriver2.6/dd/btp.mod.c =================================================================== --- branches/daqclients-8_2/clients/btdriver2.6/dd/btp.mod.c 2010-07-23 13:30:26 UTC (rev 2341) +++ branches/daqclients-8_2/clients/btdriver2.6/dd/btp.mod.c 2010-07-23 14:52:31 UTC (rev 2342) @@ -17,77 +17,70 @@ static const struct modversion_info ____versions[] __used __attribute__((section("__versions"))) = { - { 0xa7672d5a, "module_layout" }, - { 0x6bc3fbc0, "__unregister_chrdev" }, - { 0x2e9014ad, "per_cpu__current_task" }, - { 0x53319a21, "pci_bus_read_config_byte" }, + { 0x36ef467a, "struct_module" }, + { 0xa52c7cac, "per_cpu__current_task" }, + { 0x869ede3d, "pci_bus_read_config_byte" }, { 0x12da5bb2, "__kmalloc" }, - { 0xe23d7acb, "up_read" }, - { 0x51150e8d, "mem_map" }, + { 0xba2513f6, "__mod_timer" }, + { 0x60253ab0, "up_read" }, + { 0xc54df5e7, "mem_map" }, { 0xd6ee688f, "vmalloc" }, - { 0xb279da12, "pv_lock_ops" }, - { 0x6980fe91, "param_get_int" }, - { 0x6307fc98, "del_timer" }, - { 0x3457cb68, "param_set_long" }, - { 0xd46e5e9e, "set_page_dirty_lock" }, - { 0x973873ab, "_spin_lock" }, - { 0x43ab66c3, "param_array_get" }, - { 0x45d11c43, "down_interruptible" }, - { 0xe032fea4, "__register_chrdev" }, - { 0xd1356df6, "x86_dma_fallback_dev" }, - { 0x6a9f26c9, "init_timer_key" }, + { 0xa5423cc4, "param_get_int" }, + { 0xfd894486, "del_timer" }, + { 0xf0b57c68, "param_set_long" }, + { 0xdccb027d, "set_page_dirty_lock" }, + { 0x900e0d6, "_spin_lock" }, + { 0xeeb1717c, "param_array_get" }, + { 0x7dd8a396, "down_interruptible" }, { 0x999e8297, "vfree" }, - { 0xec0d0161, "pci_bus_write_config_word" }, - { 0xff964b25, "param_set_int" }, - { 0x712aa29b, "_spin_lock_irqsave" }, - { 0x45947727, "param_array_set" }, + { 0x1fcb2076, "pci_bus_write_config_word" }, + { 0xcb32da10, "param_set_int" }, + { 0xeaa456ed, "_spin_lock_irqsave" }, + { 0xab471003, "param_array_set" }, { 0x7d11c268, "jiffies" }, - { 0xb4b0ee4e, "down_read" }, - { 0x9629486a, "per_cpu__cpu_number" }, - { 0xee72d4cb, "pci_set_master" }, - { 0x861fa3c3, "pci_set_dma_mask" }, - { 0x9ced38aa, "down_trylock" }, - { 0xb72397d5, "printk" }, - { 0xacdeb154, "__tracepoint_module_get" }, - { 0xe52592a, "panic" }, - { 0xca00976d, "kunmap" }, + { 0xf0c7cc95, "down_read" }, + { 0x518eb764, "per_cpu__cpu_number" }, + { 0xa5908852, "pci_set_master" }, + { 0xaa71e8b9, "pci_set_dma_mask" }, + { 0xb07f7d85, "down_trylock" }, + { 0x1b7d4074, "printk" }, + { 0x1075bf0, "panic" }, + { 0x76fdbfa1, "kunmap" }, { 0xb6ed1e53, "strncpy" }, - { 0x2f287f0d, "copy_to_user" }, - { 0xb4390f9a, "mcount" }, - { 0x9115df12, "pci_bus_write_config_dword" }, - { 0x748caf40, "down" }, - { 0x4b07e779, "_spin_unlock_irqrestore" }, - { 0x46085e4f, "add_timer" }, - { 0x55b3133e, "dma_release_from_coherent" }, - { 0xfda85a7d, "request_threaded_irq" }, - { 0xd999c118, "dma_alloc_from_coherent" }, + { 0x2da418b5, "copy_to_user" }, + { 0xe2f88b3c, "dma_free_coherent" }, + { 0xa62d435f, "pci_bus_write_config_dword" }, + { 0xdb8bd46f, "down" }, + { 0x27147e64, "_spin_unlock_irqrestore" }, + { 0xa8d536b5, "dma_alloc_coherent" }, { 0x61651be, "strcat" }, - { 0x7102133b, "module_put" }, - { 0x3af98f9e, "ioremap_nocache" }, - { 0x8a1b1633, "pci_bus_read_config_word" }, - { 0xb9cbdeac, "kmap" }, - { 0x8bd5b603, "param_get_long" }, - { 0x1bc2af34, "pci_bus_read_config_dword" }, - { 0xf0fdf6cb, "__stack_chk_fail" }, - { 0xf1b972ca, "get_user_pages" }, - { 0x108e8985, "param_get_uint" }, + { 0x9634873b, "module_put" }, + { 0xe914d009, "ioremap_nocache" }, + { 0xe1c3b4c8, "pci_bus_read_config_word" }, + { 0x6934f892, "kmap" }, + { 0x2de9f66f, "param_get_long" }, + { 0x6a59427d, "pci_bus_read_config_dword" }, + { 0xc6f41ca4, "get_user_pages" }, + { 0xedd14538, "param_get_uint" }, + { 0x1fc91fb2, "request_irq" }, { 0xd62c833f, "schedule_timeout" }, - { 0x5a020d9d, "pci_unregister_driver" }, - { 0x7ecb001b, "__per_cpu_offset" }, - { 0x23ea5e67, "pci_bus_write_config_byte" }, + { 0x7684a370, "register_chrdev" }, + { 0xbb256af3, "pci_unregister_driver" }, + { 0x76c31941, "init_timer" }, + { 0x29e3c08b, "pci_bus_write_config_byte" }, { 0x37a0cba, "kfree" }, - { 0x5f557f9b, "remap_pfn_range" }, - { 0x3285cc48, "param_set_uint" }, + { 0xbbc366f2, "remap_pfn_range" }, + { 0x126970ed, "param_set_uint" }, { 0xedc03953, "iounmap" }, - { 0x3f1899f1, "up" }, - { 0x29ecd539, "__pci_register_driver" }, - { 0x77eb0156, "put_page" }, - { 0x9f614c32, "vmalloc_to_page" }, - { 0x8a802dbd, "pci_enable_device" }, - { 0x5dee90ee, "pci_set_consistent_dma_mask" }, - { 0xd6c963c, "copy_from_user" }, + { 0x9ef749e2, "unregister_chrdev" }, + { 0x381da1, "up" }, + { 0xc88d5e80, "__pci_register_driver" }, + { 0xc12208, "put_page" }, + { 0x57ca9d9d, "vmalloc_to_page" }, + { 0x7e70b68f, "pci_enable_device" }, + { 0xac17cf82, "pci_set_consistent_dma_mask" }, + { 0xf2a644fb, "copy_from_user" }, { 0x9e7d6bd0, "__udelay" }, - { 0x78968d6e, "dma_ops" }, { 0xf20dabd8, "free_irq" }, }; @@ -104,5 +97,3 @@ MODULE_ALIAS("pci:v0000108Ad00000011sv*sd*bc*sc*i*"); MODULE_ALIAS("pci:v0000108Ad00000040sv*sd*bc*sc*i*"); MODULE_ALIAS("pci:v0000108Ad00000041sv*sd*bc*sc*i*"); - -MODULE_INFO(srcversion, "FE9776C6614F13D6DC7456D"); Modified: branches/daqclients-8_2/clients/btdriver2.6/dd/btp_cfg.c =================================================================== --- branches/daqclients-8_2/clients/btdriver2.6/dd/btp_cfg.c 2010-07-23 13:30:26 UTC (rev 2341) +++ branches/daqclients-8_2/clients/btdriver2.6/dd/btp_cfg.c 2010-07-23 14:52:31 UTC (rev 2342) @@ -35,7 +35,7 @@ #include <linux/pci.h> #include <asm/irq.h> #include <asm/io.h> -#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,26)) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) #include <linux/devfs_fs_kernel.h> #endif #include <linux/module.h> @@ -300,7 +300,7 @@ WARN_STR("Kernel page size does not match hardware page size\n"); return -ENODEV; } -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,26) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) SET_MODUE_OWNER(&btp_fops); #else btp_fops.owner = THIS_MODULE; Modified: branches/daqclients-8_2/clients/configure.in =================================================================== --- branches/daqclients-8_2/clients/configure.in 2010-07-23 13:30:26 UTC (rev 2341) +++ branches/daqclients-8_2/clients/configure.in 2010-07-23 14:52:31 UTC (rev 2342) @@ -6,7 +6,7 @@ # Separate device libraries. -AM_INIT_AUTOMAKE(nscldaq, 8.2-007) +AM_INIT_AUTOMAKE(nscldaq, 8.2-008) # # The variable below should track the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |