lstopo/x11+windows: refresh the topology+binding when hitting F5 key

Closes #402

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

NEWS

@@ -30,6 +30,8 @@ Version 2.3.0
   + Tools that have a --restrict option may now receive a nodeset or
     some custom flags for restricting the topology.
   + Fix lstopo drawing when autoresizing on Windows 10.
+  + Pressing the F5 key in lstopo X11 and Windows graphical/interactive outputs
+    now refreshes the display according to the current topology and binding.
   + Add a tikz lstopo graphical backend to generate picture easily included into
     LaTeX documents.
 

tests/hwloc/ports/include/windows/windows.h

@@ -148,6 +148,7 @@ HGDIOBJ SelectObject(HDC hdc, HGDIOBJ hgdiobj);
 
 HWND WINAPI CreateWindow(LPCTSTR lpClassName, LPCTSTR lpWindowName, DWORD dwStyle, int x, int y, int nWidth, int nHeight, HWND hWndParent, HMENU hMenu, HINSTANCE hInstance, LPVOID lpParam);
 BOOL WINAPI ShowWindow(HWND hWnd, int nCmdShow);
+BOOL InvalidateRect(HWND hWnd, const RECT *lpRect, BOOL bErase);
 BOOL UpdateWindow(HWND hWnd);
 BOOL RedrawWindow(HWND hWnd, const RECT *lprcUpdate, HRGN hrgnUpdate, UINT flags);
 BOOL DestroyWindow(HWND hWnd);
@@ -191,6 +192,7 @@ VOID WINAPI PostQuitMessage(int nExitCode);
 #define VK_UP 38
 #define VK_RIGHT 39
 #define VK_DOWN 40
+#define VK_F5 0x74
 
 #define RDW_INVALIDATE 1
 

utils/lstopo/lstopo-cairo.c

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2019 Inria.  All rights reserved.
+ * Copyright © 2009-2020 Inria.  All rights reserved.
  * Copyright © 2009-2010, 2014, 2017, 2020 Université Bordeaux
  * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -376,7 +376,7 @@ output_x11(struct lstopo_output *loutput, const char *dummy __hwloc_attribute_un
 
   topo_cairo_paint(coutput);
 
-  while (!finish) {
+  while (!finish && !loutput->needs_topology_refresh) {
     XEvent e;
     if (!XEventsQueued(disp->dpy, QueuedAfterFlush)) {
       /* No pending event, flush moving windows before waiting for next event */
@@ -441,6 +441,9 @@ output_x11(struct lstopo_output *loutput, const char *dummy __hwloc_attribute_un
 	case XK_Escape:
 	  finish = 1;
 	  break;
+        case XK_F5:
+          loutput->needs_topology_refresh = 1;
+          break;
 	case XK_Left:
 	  disp->x -= disp->screen_width/10;
 	  move_x11(disp);

utils/lstopo/lstopo-draw.c

@@ -112,6 +112,8 @@ destroy_colors(void)
       free(tmp);
     tmp = next;
   }
+
+  colors = NULL; /* so that it works after refresh */
 }
 
 static struct lstopo_color *

utils/lstopo/lstopo-windows.c

@@ -290,6 +290,9 @@ WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)
       case VK_CONTROL:
         control = 1;
         break;
+      case VK_F5:
+        loutput->needs_topology_refresh = 1;
+        break;
       }
       break;
     case WM_KEYUP:
@@ -407,11 +410,11 @@ struct draw_methods windows_draw_methods = {
   windows_textsize,
 };
 
+static HWND toplevel = NULL;
+
 int
 output_windows (struct lstopo_output *loutput, const char *dummy __hwloc_attribute_unused)
 {
-  WNDCLASS wndclass;
-  HWND toplevel;
   unsigned width, height;
   HFONT font;
   MSG msg;
@@ -422,21 +425,25 @@ output_windows (struct lstopo_output *loutput, const char *dummy __hwloc_attribu
   loutput->methods = &windows_draw_methods;
   loutput->backend_data = &the_output;
 
-  /* create the toplevel window, with random size for now */
-  memset(&wndclass, 0, sizeof(wndclass));
-  wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
-  wndclass.hCursor = LoadCursor(NULL, IDC_SIZEALL);
-  wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-  wndclass.lpfnWndProc = WndProc;
-  wndclass.lpszClassName = "lstopo";
-
-  RegisterClass(&wndclass);
+  if (!toplevel) {
+    /* create the toplevel window, with random size for now */
+    WNDCLASS wndclass;
+    memset(&wndclass, 0, sizeof(wndclass));
+    wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
+    wndclass.hCursor = LoadCursor(NULL, IDC_SIZEALL);
+    wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+    wndclass.lpfnWndProc = WndProc;
+    wndclass.lpszClassName = "lstopo";
+
+    RegisterClass(&wndclass);
+
+    toplevel = CreateWindow("lstopo", loutput->title, WS_OVERLAPPEDWINDOW,
+                            CW_USEDEFAULT, CW_USEDEFAULT,
+                            10, 10, NULL, NULL, NULL, NULL);
+  }
 
   /* recurse once for preparing sizes and positions using a fake top level window */
   loutput->drawing = LSTOPO_DRAWING_PREPARE;
-  toplevel = CreateWindow("lstopo", loutput->title, WS_OVERLAPPEDWINDOW,
-			      CW_USEDEFAULT, CW_USEDEFAULT,
-			      10, 10, NULL, NULL, NULL, NULL);
   BeginPaint(toplevel, &the_output.ps);
   font = CreateFont(loutput->fontsize, 0, 0, 0, 0, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, NULL);
   SelectObject(the_output.ps.hdc, (HGDIOBJ) font);
@@ -486,14 +493,16 @@ output_windows (struct lstopo_output *loutput, const char *dummy __hwloc_attribu
 
   lstopo_show_interactive_help();
   ShowWindow(toplevel, SW_SHOWDEFAULT);
+  InvalidateRect(toplevel, NULL, 1); /* make sure UpdateWindow() will update something when refreshing the topology */
   UpdateWindow(toplevel);
 
-  while (!finish && GetMessage(&msg, NULL, 0, 0)) {
+  while (!finish && !loutput->needs_topology_refresh && GetMessage(&msg, NULL, 0, 0)) {
     TranslateMessage(&msg);
     DispatchMessage(&msg);
   }
 
-  DestroyWindow(toplevel);
+  if (!loutput->needs_topology_refresh)
+    DestroyWindow(toplevel);
   destroy_colors();
   return 0;
 }

utils/lstopo/lstopo.c

@@ -452,6 +452,7 @@ void lstopo_show_interactive_help(void)
   printf("  Scroll horizontally ................. Left Right Ctrl+PageUp/Down\n");
   printf("  Scroll to the top-left corner ....... Home\n");
   printf("  Scroll to the bottom-right corner ... End\n");
+  printf("  Refresh the topology ................ F5\n");
   printf("  Show this help ...................... h H ?\n");
   printf("  Exit ................................ q Q Esc\n");
   printf(" Configuration tweaks:\n");
@@ -1315,6 +1316,9 @@ main (int argc, char *argv[])
     goto out_usagefailure;
   }
 
+ refresh:
+  loutput.needs_topology_refresh = 0;
+
   /*************************
    * Configure the topology
    */
@@ -1494,6 +1498,9 @@ main (int argc, char *argv[])
 
   hwloc_topology_destroy (topology);
 
+  if (loutput.needs_topology_refresh)
+    goto refresh;
+
   for(i=0; i<loutput.legend_append_nr; i++)
     free(loutput.legend_append[i]);
   free(loutput.legend_append);

utils/lstopo/lstopo.h

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2019 Inria.  All rights reserved.
+ * Copyright © 2009-2020 Inria.  All rights reserved.
  * Copyright © 2009-2010, 2012, 2015 Université Bordeaux
  * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
  * Copyright © 2020 Hewlett-Packard Enterprise.  All rights reserved.
@@ -42,6 +42,9 @@ struct lstopo_output {
   hwloc_topology_t topology;
   unsigned depth;
 
+  /* when an interactive backends want a refresh of the topology */
+  int needs_topology_refresh;
+
   /* file config */
   FILE *file;
   int overwrite;