Revision: 54106
http://brlcad.svn.sourceforge.net/brlcad/?rev=54106&view=rev
Author: caen23
Date: 2012-12-21 11:50:43 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
Enable fbthreadtest for compilation (GCI:
http://www.google-melange.com/gci/task/view/google/gci2012/7994227)
Modified Paths:
--------------
brlcad/trunk/src/fb/CMakeLists.txt
Added Paths:
-----------
brlcad/trunk/src/fb/tests/
brlcad/trunk/src/fb/tests/CMakeLists.txt
brlcad/trunk/src/fb/tests/fbthreadtest.c
Removed Paths:
-------------
brlcad/trunk/src/fb/fbthreadtest.c
Modified: brlcad/trunk/src/fb/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/fb/CMakeLists.txt 2012-12-20 23:02:55 UTC (rev 54105)
+++ brlcad/trunk/src/fb/CMakeLists.txt 2012-12-21 11:50:43 UTC (rev 54106)
@@ -49,11 +49,6 @@
endif(HAVE_TERMLIB)
BRLCAD_ADDEXEC(fbscanplot fbscanplot.c libfb)
BRLCAD_ADDEXEC(fbstretch "fbstretch.c;ioutil.c" libfb)
-if(BRLCAD_ENABLE_TK)
- BRLCAD_ADDEXEC(fbthreadtest fbthreadtest.c "libfb;${TCL_TK_LIBRARY}")
- SET_TARGET_PROPERTIES(fbthreadtest PROPERTIES COMPILE_DEFINITIONS "IF_TK")
- SET_TARGET_PROPERTIES(fbthreadtest PROPERTIES LINKER_LANGUAGE C)
-endif(BRLCAD_ENABLE_TK)
if(HAVE_TERMLIB)
BRLCAD_ADDEXEC(fbzoom fbzoom.c "libfb;libtermio")
endif(HAVE_TERMLIB)
@@ -76,7 +71,8 @@
BRLCAD_ADDEXEC(spm-fb spm-fb.c "libfb;libbn")
-CMAKEFILES(fbthreadtest.c)
+add_subdirectory(tests)
+
CMAKEFILES(Makefile.am)
# Local Variables:
Deleted: brlcad/trunk/src/fb/fbthreadtest.c
===================================================================
--- brlcad/trunk/src/fb/fbthreadtest.c 2012-12-20 23:02:55 UTC (rev 54105)
+++ brlcad/trunk/src/fb/fbthreadtest.c 2012-12-21 11:50:43 UTC (rev 54106)
@@ -1,335 +0,0 @@
-/* F B T H R E A D T E S T. C
- * BRL-CAD
- *
- * Copyright (c) 1986-2012 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- *
- */
-/** @file fbthreadtest.c
- *
- * Throwaway program to test ideas about Tcl/Tk threading and framebuffer
- * display.
- *
- */
-
-#include "common.h"
-
-#include <stdlib.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_WINSOCK_H
-# include <winsock.h>
-#endif
-#include "bio.h"
-
-#include "bu.h"
-#include "fb.h"
-
-#include <tcl.h>
-#include <tk.h>
-
-#include "pkg.h"
-
-#ifdef TCL_THREADS
-
-TCL_DECLARE_MUTEX(threadMutex)
-
- typedef struct TestEvent {
- Tcl_Event header;
- int *testnum;
- } TestEvent;
-
-static int
-TestEventProc(
- Tcl_Event *evPtr,
- int flags)
-{
-
- TestEvent *testevent = (TestEvent *) evPtr;
- (*(testevent->testnum))++;
- printf("test count: %d\n", *(testevent->testnum));
- return 1;
-}
-
-
-int
-TclThreadIncrement(
- Tcl_Interp *interp,
- Tcl_ThreadId id,
- int *increment)
-{
- Tcl_ThreadId threadId = (Tcl_ThreadId) id;
- TestEvent *testevt;
-
- testevt = (TestEvent *) bu_malloc(sizeof(TestEvent), "test event");
- testevt->header.proc = TestEventProc;
- testevt->testnum = increment;
- Tcl_ThreadQueueEvent(threadId, (Tcl_Event *)testevt, TCL_QUEUE_TAIL);
- Tcl_ThreadAlert(threadId);
- printf("increment val: %d\n", *increment);
-}
-
-
-static Tcl_ThreadCreateType threadprocprint(ClientData data) {
- printf("In thread\n");
- Tcl_ExitThread(TCL_OK);
- TCL_THREAD_CREATE_RETURN;
-}
-
-
-int skipbytes(int fd, off_t num);
-
-static unsigned char *scanline; /* 1 scanline pixel buffer */
-static int scanbytes; /* # of bytes of scanline */
-static int scanpix; /* # of pixels of scanline */
-
-static char *framebuffer = NULL;
-static char *file_name;
-static int infd;
-
-static int fileinput = 0; /* file of pipe on input? */
-static int autosize = 0; /* !0 to autosize input */
-
-static unsigned long int file_width = 512; /* default input width */
-static unsigned long int file_height = 512; /* default input height */
-static int scr_width = 0; /* screen tracks file if not given */
-static int scr_height = 0;
-static int pause_sec = 10; /* Pause that many seconds before closing the FB
- and exiting */
-
-int
-get_args(int argc, char **argv)
-{
- int c;
-
- while ((c = bu_getopt(argc, argv, "F:")) != -1) {
- switch (c) {
- case 'F':
- framebuffer = bu_optarg;
- break;
- default: /* '?' */
- return 0;
- }
- }
-
- if (bu_optind >= argc) {
- if (isatty(fileno(stdin)))
- return 0;
- file_name = "-";
- infd = 0;
- } else {
- file_name = argv[bu_optind];
- if ((infd = open(file_name, 0)) < 0) {
- perror(file_name);
- fprintf(stderr,
- "pix-fb: cannot open \"%s\" for reading\n",
- file_name);
- bu_exit(1, NULL);
- }
- fileinput++;
- }
-
- if (argc > ++bu_optind)
- fprintf(stderr, "pix-fb: excess argument(s) ignored\n");
-
- return 1; /* OK */
-}
-
-
-int
-main(int argc, char **argv)
-{
- Tcl_Interp *binterp;
- Tk_Window bwin;
- Tk_PhotoHandle bphoto;
-
- /* Note that Tk_PhotoPutBlock claims to have a faster
- * copy method when pixelSize is 4 and alphaOffset is
- * 3 - perhaps output could be massaged to generate this
- * type of information and speed up the process?
- *
- * Might as well use one block and set the three things
- * that actually change in tk_write
- */
- Tk_PhotoImageBlock bblock = {
- NULL, /*Pointer to first pixel*/
- 0, /*Width of block in pixels*/
- 1, /*Height of block in pixels - always one for a scanline*/
- 0, /*Address difference between successive lines*/
- 3, /*Address difference between successive pixels on one scanline*/
- {
- RED,
- GRN,
- BLU,
- 0 /* alpha */
- }
- };
-
- Tcl_ThreadId threadID;
- ClientData data;
-
- int y;
- int xout, yout, n, m, xstart, xskip;
-
- if (!get_args(argc, argv)) {
- bu_exit(1, NULL);
- }
-
- FBIO *ifp;
- ifp = (FBIO *) calloc(sizeof(FBIO), 1);
- ifp->if_name = "/dev/tk";
- ifp->if_magic = FB_MAGIC;
- char *fbname = "/dev/tk";
-
-
- /* set the screen size */
- scr_width = 512;
- scr_height = 512;
-
- binterp = Tcl_CreateInterp();
- const char *cmd = "package require Tk";
-
- if (Tcl_Init(binterp) == TCL_ERROR) {
- fb_log("Tcl_Init returned error in fb_open.");
- }
-
- if (Tcl_Eval(binterp, cmd) != TCL_OK) {
- fb_log("Error returned attempting to start tk in fb_open.");
- }
-
-
- bwin = Tk_MainWindow(binterp);
-
- Tk_GeometryRequest(bwin, scr_width, scr_height);
-
- Tk_MakeWindowExist(bwin);
-
- char image_create_cmd[255];
- sprintf(image_create_cmd,
- "image create photo b_tk_photo -height %d -width %d",
- scr_width, scr_height);
-
- if (Tcl_Eval(binterp, image_create_cmd) != TCL_OK) {
- fb_log("Error returned attempting to create image in fb_open.");
- }
-
- if ((bphoto = Tk_FindPhoto(binterp, "b_tk_photo")) == NULL) {
- fb_log("Image creation unsuccessful in fb_open.");
- }
-
- char canvas_create_cmd[255];
- sprintf(canvas_create_cmd,
- "canvas .b_tk_canvas -height %d -width %d", scr_width, scr_height);
-
- if (Tcl_Eval(binterp, canvas_create_cmd) != TCL_OK) {
- fb_log("Error returned attempting to create canvas in fb_open.");
- }
-
- const char canvas_pack_cmd[255] =
- "pack .b_tk_canvas -fill both -expand true";
-
- if (Tcl_Eval(binterp, canvas_pack_cmd) != TCL_OK) {
- fb_log("Error returned attempting to pack canvas in fb_open. %s",
- Tcl_GetStringResult(binterp));
- }
-
- const char place_image_cmd[255] =
- ".b_tk_canvas create image 0 0 -image b_tk_photo -anchor nw";
- if (Tcl_Eval(binterp, place_image_cmd) != TCL_OK) {
- fb_log("Error returned attempting to place image in fb_open. %s",
- Tcl_GetStringResult(binterp));
- }
-
- /* Set our Tcl variable pertaining to whether a
- * window closing event has been seen from the
- * Window manager. WM_DELETE_WINDOW will be
- * bound to a command setting this variable to
- * the string "close", in order to let tk_fb_close
- * detect the Tk event and handle the closure
- * itself.
- */
- Tcl_SetVar(binterp, "CloseWindow", "open", 0);
- const char *wmcmd = "wm protocol . WM_DELETE_WINDOW {set CloseWindow
\"close\"}";
- if (Tcl_Eval(binterp, wmcmd) != TCL_OK) {
- fb_log("Error binding WM_DELETE_WINDOW.");
- }
-
-
- while (Tcl_DoOneEvent(TCL_ALL_EVENTS|TCL_DONT_WAIT));
-
- scanbytes = scr_width * sizeof(RGBpixel);
- if ((scanline = (unsigned char *)malloc(scanbytes)) == RGBPIXEL_NULL) {
- fprintf(stderr,
- "pix-fb: malloc(%d) failure for scanline buffer\n",
- scanbytes);
- bu_exit(2, NULL);
- }
-
- /* Normal way -- bottom to top */
- for (y = 0; y < scr_height; y++) {
- /*sleep(1);*/
- printf("y: %d\n", y);
- n = bu_mread(infd, (char *)scanline, scanbytes);
- if (n <= 0) break;
- bblock.pixelPtr = (unsigned char *)scanline;
- bblock.width = 512;
- bblock.pitch = 3 * scr_width;
-#if defined(TK_MAJOR_VERSION) && TK_MAJOR_VERSION == 8 &&
defined(TK_MINOR_VERSION) && TK_MINOR_VERSION < 5
- Tk_PhotoPutBlock(binterp, &bblock, 0, 512-y, 512, 1,
TK_PHOTO_COMPOSITE_SET);
-#else
- Tk_PhotoPutBlock(binterp, bphoto, &bblock, 0, 512-y, 512, 1,
TK_PHOTO_COMPOSITE_SET);
-#endif
- while (Tcl_DoOneEvent(TCL_ALL_EVENTS|TCL_DONT_WAIT));
- /* slop at the end of the line? */
- }
- while (Tcl_DoOneEvent(TCL_ALL_EVENTS|TCL_DONT_WAIT));
-
- Tcl_CreateThread(&threadID, threadprocprint, (ClientData) data,
TCL_THREAD_STACK_DEFAULT, TCL_THREAD_NOFLAGS);
- printf("ran Tcl_CreateThread\n");
-
- Tcl_Eval(binterp, "vwait CloseWindow");
- if (BU_STR_EQUAL(Tcl_GetVar(binterp, "CloseWindow", 0), "close")) {
- Tcl_Eval(binterp, "destroy .");
- }
-
- bu_exit(0, NULL);
-}
-
-
-#else
-int
-main(int argc, char **argv)
-{
- if (argc > 0) {
- fprintf(stderr, "%s: TCL_THREADS is not defined. Exiting\n", argv[0]);
- }
- return 0;
-}
-#endif /*(TCL_THREADS)*/
-
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
Added: brlcad/trunk/src/fb/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/fb/tests/CMakeLists.txt (rev 0)
+++ brlcad/trunk/src/fb/tests/CMakeLists.txt 2012-12-21 11:50:43 UTC (rev
54106)
@@ -0,0 +1,5 @@
+if(BRLCAD_ENABLE_TK)
+ BRLCAD_ADDEXEC(fbthreadtest fbthreadtest.c "libfb;${TCL_TK_LIBRARY}"
NO_INSTALL LOCAL)
+ SET_TARGET_PROPERTIES(fbthreadtest PROPERTIES COMPILE_DEFINITIONS "IF_TK")
+ SET_TARGET_PROPERTIES(fbthreadtest PROPERTIES LINKER_LANGUAGE C)
+endif(BRLCAD_ENABLE_TK)
Property changes on: brlcad/trunk/src/fb/tests/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/trunk/src/fb/tests/fbthreadtest.c
===================================================================
--- brlcad/trunk/src/fb/tests/fbthreadtest.c (rev 0)
+++ brlcad/trunk/src/fb/tests/fbthreadtest.c 2012-12-21 11:50:43 UTC (rev
54106)
@@ -0,0 +1,335 @@
+/* F B T H R E A D T E S T. C
+ * BRL-CAD
+ *
+ * Copyright (c) 1986-2012 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ *
+ */
+/** @file fbthreadtest.c
+ *
+ * Throwaway program to test ideas about Tcl/Tk threading and framebuffer
+ * display.
+ *
+ */
+
+#include "common.h"
+
+#include <stdlib.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_WINSOCK_H
+# include <winsock.h>
+#endif
+#include "bio.h"
+
+#include "bu.h"
+#include "fb.h"
+
+#include <tcl.h>
+#include <tk.h>
+
+#include "pkg.h"
+
+#ifdef TCL_THREADS
+
+TCL_DECLARE_MUTEX(threadMutex)
+
+ typedef struct TestEvent {
+ Tcl_Event header;
+ int *testnum;
+ } TestEvent;
+
+static int
+TestEventProc(
+ Tcl_Event *evPtr,
+ int flags)
+{
+
+ TestEvent *testevent = (TestEvent *) evPtr;
+ (*(testevent->testnum))++;
+ printf("test count: %d\n", *(testevent->testnum));
+ return 1;
+}
+
+
+int
+TclThreadIncrement(
+ Tcl_Interp *interp,
+ Tcl_ThreadId id,
+ int *increment)
+{
+ Tcl_ThreadId threadId = (Tcl_ThreadId) id;
+ TestEvent *testevt;
+
+ testevt = (TestEvent *) bu_malloc(sizeof(TestEvent), "test event");
+ testevt->header.proc = TestEventProc;
+ testevt->testnum = increment;
+ Tcl_ThreadQueueEvent(threadId, (Tcl_Event *)testevt, TCL_QUEUE_TAIL);
+ Tcl_ThreadAlert(threadId);
+ printf("increment val: %d\n", *increment);
+}
+
+
+static Tcl_ThreadCreateType threadprocprint(ClientData data) {
+ printf("In thread\n");
+ Tcl_ExitThread(TCL_OK);
+ TCL_THREAD_CREATE_RETURN;
+}
+
+
+int skipbytes(int fd, off_t num);
+
+static unsigned char *scanline; /* 1 scanline pixel buffer */
+static int scanbytes; /* # of bytes of scanline */
+static int scanpix; /* # of pixels of scanline */
+
+static char *framebuffer = NULL;
+static char *file_name;
+static int infd;
+
+static int fileinput = 0; /* file of pipe on input? */
+static int autosize = 0; /* !0 to autosize input */
+
+static unsigned long int file_width = 512; /* default input width */
+static unsigned long int file_height = 512; /* default input height */
+static int scr_width = 0; /* screen tracks file if not given */
+static int scr_height = 0;
+static int pause_sec = 10; /* Pause that many seconds before closing the FB
+ and exiting */
+
+int
+get_args(int argc, char **argv)
+{
+ int c;
+
+ while ((c = bu_getopt(argc, argv, "F:")) != -1) {
+ switch (c) {
+ case 'F':
+ framebuffer = bu_optarg;
+ break;
+ default: /* '?' */
+ return 0;
+ }
+ }
+
+ if (bu_optind >= argc) {
+ if (isatty(fileno(stdin)))
+ return 0;
+ file_name = "-";
+ infd = 0;
+ } else {
+ file_name = argv[bu_optind];
+ if ((infd = open(file_name, 0)) < 0) {
+ perror(file_name);
+ fprintf(stderr,
+ "pix-fb: cannot open \"%s\" for reading\n",
+ file_name);
+ bu_exit(1, NULL);
+ }
+ fileinput++;
+ }
+
+ if (argc > ++bu_optind)
+ fprintf(stderr, "pix-fb: excess argument(s) ignored\n");
+
+ return 1; /* OK */
+}
+
+
+int
+main(int argc, char **argv)
+{
+ Tcl_Interp *binterp;
+ Tk_Window bwin;
+ Tk_PhotoHandle bphoto;
+
+ /* Note that Tk_PhotoPutBlock claims to have a faster
+ * copy method when pixelSize is 4 and alphaOffset is
+ * 3 - perhaps output could be massaged to generate this
+ * type of information and speed up the process?
+ *
+ * Might as well use one block and set the three things
+ * that actually change in tk_write
+ */
+ Tk_PhotoImageBlock bblock = {
+ NULL, /*Pointer to first pixel*/
+ 0, /*Width of block in pixels*/
+ 1, /*Height of block in pixels - always one for a scanline*/
+ 0, /*Address difference between successive lines*/
+ 3, /*Address difference between successive pixels on one scanline*/
+ {
+ RED,
+ GRN,
+ BLU,
+ 0 /* alpha */
+ }
+ };
+
+ Tcl_ThreadId threadID;
+ ClientData data;
+
+ int y;
+ int xout, yout, n, m, xstart, xskip;
+
+ if (!get_args(argc, argv)) {
+ bu_exit(1, NULL);
+ }
+
+ FBIO *ifp;
+ ifp = (FBIO *) calloc(sizeof(FBIO), 1);
+ ifp->if_name = "/dev/tk";
+ ifp->if_magic = FB_MAGIC;
+ char *fbname = "/dev/tk";
+
+
+ /* set the screen size */
+ scr_width = 512;
+ scr_height = 512;
+
+ binterp = Tcl_CreateInterp();
+ const char *cmd = "package require Tk";
+
+ if (Tcl_Init(binterp) == TCL_ERROR) {
+ fb_log("Tcl_Init returned error in fb_open.");
+ }
+
+ if (Tcl_Eval(binterp, cmd) != TCL_OK) {
+ fb_log("Error returned attempting to start tk in fb_open.");
+ }
+
+
+ bwin = Tk_MainWindow(binterp);
+
+ Tk_GeometryRequest(bwin, scr_width, scr_height);
+
+ Tk_MakeWindowExist(bwin);
+
+ char image_create_cmd[255];
+ sprintf(image_create_cmd,
+ "image create photo b_tk_photo -height %d -width %d",
+ scr_width, scr_height);
+
+ if (Tcl_Eval(binterp, image_create_cmd) != TCL_OK) {
+ fb_log("Error returned attempting to create image in fb_open.");
+ }
+
+ if ((bphoto = Tk_FindPhoto(binterp, "b_tk_photo")) == NULL) {
+ fb_log("Image creation unsuccessful in fb_open.");
+ }
+
+ char canvas_create_cmd[255];
+ sprintf(canvas_create_cmd,
+ "canvas .b_tk_canvas -height %d -width %d", scr_width, scr_height);
+
+ if (Tcl_Eval(binterp, canvas_create_cmd) != TCL_OK) {
+ fb_log("Error returned attempting to create canvas in fb_open.");
+ }
+
+ const char canvas_pack_cmd[255] =
+ "pack .b_tk_canvas -fill both -expand true";
+
+ if (Tcl_Eval(binterp, canvas_pack_cmd) != TCL_OK) {
+ fb_log("Error returned attempting to pack canvas in fb_open. %s",
+ Tcl_GetStringResult(binterp));
+ }
+
+ const char place_image_cmd[255] =
+ ".b_tk_canvas create image 0 0 -image b_tk_photo -anchor nw";
+ if (Tcl_Eval(binterp, place_image_cmd) != TCL_OK) {
+ fb_log("Error returned attempting to place image in fb_open. %s",
+ Tcl_GetStringResult(binterp));
+ }
+
+ /* Set our Tcl variable pertaining to whether a
+ * window closing event has been seen from the
+ * Window manager. WM_DELETE_WINDOW will be
+ * bound to a command setting this variable to
+ * the string "close", in order to let tk_fb_close
+ * detect the Tk event and handle the closure
+ * itself.
+ */
+ Tcl_SetVar(binterp, "CloseWindow", "open", 0);
+ const char *wmcmd = "wm protocol . WM_DELETE_WINDOW {set CloseWindow
\"close\"}";
+ if (Tcl_Eval(binterp, wmcmd) != TCL_OK) {
+ fb_log("Error binding WM_DELETE_WINDOW.");
+ }
+
+
+ while (Tcl_DoOneEvent(TCL_ALL_EVENTS|TCL_DONT_WAIT));
+
+ scanbytes = scr_width * sizeof(RGBpixel);
+ if ((scanline = (unsigned char *)malloc(scanbytes)) == RGBPIXEL_NULL) {
+ fprintf(stderr,
+ "pix-fb: malloc(%d) failure for scanline buffer\n",
+ scanbytes);
+ bu_exit(2, NULL);
+ }
+
+ /* Normal way -- bottom to top */
+ for (y = 0; y < scr_height; y++) {
+ /*sleep(1);*/
+ printf("y: %d\n", y);
+ n = bu_mread(infd, (char *)scanline, scanbytes);
+ if (n <= 0) break;
+ bblock.pixelPtr = (unsigned char *)scanline;
+ bblock.width = 512;
+ bblock.pitch = 3 * scr_width;
+#if defined(TK_MAJOR_VERSION) && TK_MAJOR_VERSION == 8 &&
defined(TK_MINOR_VERSION) && TK_MINOR_VERSION < 5
+ Tk_PhotoPutBlock(binterp, &bblock, 0, 512-y, 512, 1,
TK_PHOTO_COMPOSITE_SET);
+#else
+ Tk_PhotoPutBlock(binterp, bphoto, &bblock, 0, 512-y, 512, 1,
TK_PHOTO_COMPOSITE_SET);
+#endif
+ while (Tcl_DoOneEvent(TCL_ALL_EVENTS|TCL_DONT_WAIT));
+ /* slop at the end of the line? */
+ }
+ while (Tcl_DoOneEvent(TCL_ALL_EVENTS|TCL_DONT_WAIT));
+
+ Tcl_CreateThread(&threadID, threadprocprint, (ClientData) data,
TCL_THREAD_STACK_DEFAULT, TCL_THREAD_NOFLAGS);
+ printf("ran Tcl_CreateThread\n");
+
+ Tcl_Eval(binterp, "vwait CloseWindow");
+ if (BU_STR_EQUAL(Tcl_GetVar(binterp, "CloseWindow", 0), "close")) {
+ Tcl_Eval(binterp, "destroy .");
+ }
+
+ bu_exit(0, NULL);
+}
+
+
+#else
+int
+main(int argc, char **argv)
+{
+ if (argc > 0) {
+ fprintf(stderr, "%s: TCL_THREADS is not defined. Exiting\n", argv[0]);
+ }
+ return 0;
+}
+#endif /*(TCL_THREADS)*/
+
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/trunk/src/fb/tests/fbthreadtest.c
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
