Changes in / [3d93289a:0c37135] in mainline
- Files:
-
- 92 added
- 120 deleted
- 31 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile
r3d93289a r0c37135 66 66 cp "$$file" "$(DIST_PATH)/app/" ; \ 67 67 done 68 for file in $(NET_CFG) ; do \69 cp "$$file" "$(DIST_PATH)/cfg/net/" ; \70 done71 68 for drv in $(RD_DRVS) ; do \ 72 69 drv_dir="`dirname "$$drv"`" ; \ -
boot/Makefile.common
r3d93289a r0c37135 110 110 $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \ 111 111 $(USPACE_PATH)/srv/hid/remcons/remcons \ 112 $(USPACE_PATH)/srv/net/ethip/ethip \ 113 $(USPACE_PATH)/srv/net/inet/inet \ 114 $(USPACE_PATH)/srv/net/tcp/tcp \ 115 $(USPACE_PATH)/srv/net/udp/udp \ 112 116 $(USPACE_PATH)/srv/taskmon/taskmon \ 113 $(USPACE_PATH)/srv/net/nil/eth/eth \114 $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \115 $(USPACE_PATH)/srv/net/il/arp/arp \116 $(USPACE_PATH)/srv/net/il/ip/ip \117 $(USPACE_PATH)/srv/net/tl/icmp/icmp \118 $(USPACE_PATH)/srv/net/tl/udp/udp \119 $(USPACE_PATH)/srv/net/tl/tcp/tcp \120 $(USPACE_PATH)/srv/net/net/net \121 117 $(USPACE_PATH)/srv/devman/devman 122 118 … … 165 161 $(USPACE_PATH)/app/edit/edit \ 166 162 $(USPACE_PATH)/app/ext2info/ext2info \ 163 $(USPACE_PATH)/app/inetcfg/inetcfg \ 167 164 $(USPACE_PATH)/app/kill/kill \ 168 165 $(USPACE_PATH)/app/killall/killall \ … … 208 205 endif 209 206 210 ifneq ($(CONFIG_BAREBONE),y)211 NET_CFG = \212 $(USPACE_PATH)/srv/net/cfg/general \213 $(USPACE_PATH)/srv/net/cfg/lo.nic \214 $(USPACE_PATH)/srv/net/cfg/ne2k.nic \215 $(USPACE_PATH)/srv/net/cfg/e1k.nic216 endif217 218 207 COMPONENTS = \ 219 208 $(KERNEL_PATH)/kernel.bin \ -
boot/generic/src/printf_core.c
r3d93289a r0c37135 210 210 /* Print leading spaces. */ 211 211 size_t strw = str_length(str); 212 if ( precision == 0)212 if ((precision == 0) || (precision > strw)) 213 213 precision = strw; 214 214 -
kernel/generic/src/printf/printf_core.c
r3d93289a r0c37135 284 284 /* Print leading spaces. */ 285 285 size_t strw = str_length(str); 286 if ( precision == 0)286 if ((precision == 0) || (precision > strw)) 287 287 precision = strw; 288 288 … … 332 332 /* Print leading spaces. */ 333 333 size_t strw = wstr_length(str); 334 if ( precision == 0)334 if ((precision == 0) || (precision > strw)) 335 335 precision = strw; 336 336 -
kernel/test/print/print1.c
r3d93289a r0c37135 41 41 42 42 TPRINTF("Testing printf(\"%%8.10s\", \"text\"):\n"); 43 TPRINTF("Expected output: \" text\"\n");43 TPRINTF("Expected output: \" text\"\n"); 44 44 TPRINTF("Real output: \"%8.10s\"\n\n", "text"); 45 45 … … 48 48 TPRINTF("Real output: \"%8.10s\"\n\n", "very long text"); 49 49 50 TPRINTF("Testing printf(\"%%-*.*s\", 7, 7, \"text\"):\n"); 51 TPRINTF("Expected output: \"text \"\n"); 52 TPRINTF("Real output: \"%-*.*s\"\n\n", 7, 7, "text"); 53 50 54 return NULL; 51 55 } -
uspace/Makefile
r3d93289a r0c37135 42 42 app/getterm \ 43 43 app/init \ 44 app/inetcfg \ 44 45 app/kill \ 45 46 app/killall \ … … 75 76 srv/devman \ 76 77 srv/loader \ 78 srv/net/ethip \ 79 srv/net/inet \ 80 srv/net/tcp \ 81 srv/net/udp \ 77 82 srv/ns \ 78 83 srv/taskmon \ … … 98 103 srv/hid/remcons \ 99 104 srv/hw/char/s3c24xx_uart \ 100 srv/net/il/arp \101 srv/net/il/ip \102 srv/net/tl/icmp \103 srv/net/tl/udp \104 srv/net/tl/tcp \105 srv/net/nil/eth \106 srv/net/nil/nildummy \107 srv/net/net \108 105 drv/infrastructure/root \ 109 106 drv/infrastructure/rootvirt \ -
uspace/app/init/init.c
r3d93289a r0c37135 305 305 srv_start("/srv/s3c24ts"); 306 306 307 spawn("/srv/net"); 307 spawn("/srv/ethip"); 308 spawn("/srv/inet"); 309 spawn("/srv/tcp"); 310 spawn("/srv/udp"); 308 311 309 312 spawn("/srv/fb"); -
uspace/app/netecho/netecho.c
r3d93289a r0c37135 373 373 address_in.sin_family = AF_INET; 374 374 address_in.sin_port = htons(port); 375 address_in.sin_addr.s_addr = INADDR_ANY; 375 376 address = (struct sockaddr *) &address_in; 376 377 addrlen = sizeof(address_in); -
uspace/app/netecho/print_error.c
r3d93289a r0c37135 40 40 #include <errno.h> 41 41 42 #include <net/icmp_codes.h>43 44 /** Prints the specific ICMP error description.45 *46 * @param[in] output The description output stream. May be NULL.47 * @param[in] error_code The ICMP error code.48 * @param[in] prefix The error description prefix. May be NULL.49 * @param[in] suffix The error description suffix. May be NULL.50 */51 void icmp_print_error(FILE *output, int error_code, const char *prefix, const char *suffix)52 {53 if (!output)54 return;55 56 if (prefix)57 fprintf(output, "%s", prefix);58 59 switch (error_code) {60 case ICMP_DEST_UNREACH:61 fprintf(output, "ICMP Destination Unreachable (%d) error", error_code);62 break;63 case ICMP_SOURCE_QUENCH:64 fprintf(output, "ICMP Source Quench (%d) error", error_code);65 break;66 case ICMP_REDIRECT:67 fprintf(output, "ICMP Redirect (%d) error", error_code);68 break;69 case ICMP_ALTERNATE_ADDR:70 fprintf(output, "ICMP Alternate Host Address (%d) error", error_code);71 break;72 case ICMP_ROUTER_ADV:73 fprintf(output, "ICMP Router Advertisement (%d) error", error_code);74 break;75 case ICMP_ROUTER_SOL:76 fprintf(output, "ICMP Router Solicitation (%d) error", error_code);77 break;78 case ICMP_TIME_EXCEEDED:79 fprintf(output, "ICMP Time Exceeded (%d) error", error_code);80 break;81 case ICMP_PARAMETERPROB:82 fprintf(output, "ICMP Paramenter Problem (%d) error", error_code);83 break;84 case ICMP_CONVERSION_ERROR:85 fprintf(output, "ICMP Datagram Conversion Error (%d) error", error_code);86 break;87 case ICMP_REDIRECT_MOBILE:88 fprintf(output, "ICMP Mobile Host Redirect (%d) error", error_code);89 break;90 case ICMP_SKIP:91 fprintf(output, "ICMP SKIP (%d) error", error_code);92 break;93 case ICMP_PHOTURIS:94 fprintf(output, "ICMP Photuris (%d) error", error_code);95 break;96 default:97 fprintf(output, "Other (%d) error", error_code);98 }99 100 if (suffix)101 fprintf(output, "%s", suffix);102 }103 104 42 /** Prints the error description. 105 43 * 106 * Supports ICMP andsocket error codes.44 * Supports socket error codes. 107 45 * 108 46 * @param[in] output The description output stream. May be NULL. … … 113 51 void print_error(FILE *output, int error_code, const char *prefix, const char *suffix) 114 52 { 115 if (IS_ICMP_ERROR(error_code)) 116 icmp_print_error(output, error_code, prefix, suffix); 117 else if(IS_SOCKET_ERROR(error_code)) 53 if(IS_SOCKET_ERROR(error_code)) 118 54 socket_print_error(output, error_code, prefix, suffix); 119 55 } -
uspace/app/ping/Makefile
r3d93289a r0c37135 1 1 # 2 # Copyright (c) 2005 Martin Decky 3 # Copyright (c) 2007 Jakub Jermar 2 # Copyright (c) 2012 Jiri Svoboda 4 3 # All rights reserved. 5 4 # … … 29 28 30 29 USPACE_PREFIX = ../.. 31 LIBS =32 EXTRA_CFLAGS =33 30 BINARY = ping 34 31 35 32 SOURCES = \ 36 ping.c \ 37 print_error.c 33 ping.c 38 34 39 35 include $(USPACE_PREFIX)/Makefile.common -
uspace/app/ping/ping.c
r3d93289a r0c37135 1 1 /* 2 * Copyright (c) 20 09 Lukas Mejdrech2 * Copyright (c) 2012 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 30 30 * @{ 31 31 */ 32 33 /** @file 34 * Packet Internet Network Grouper. 32 /** @file ICMP echo utility. 35 33 */ 36 34 37 35 #include <async.h> 36 #include <bool.h> 37 #include <errno.h> 38 #include <fibril_synch.h> 39 #include <inet/inetping.h> 40 #include <io/console.h> 38 41 #include <stdio.h> 39 #include <str.h> 40 #include <task.h> 41 #include <time.h> 42 #include <ipc/services.h> 43 #include <str_error.h> 44 #include <errno.h> 45 #include <arg_parse.h> 46 47 #include <net/icmp_api.h> 48 #include <net/in.h> 49 #include <net/in6.h> 50 #include <net/inet.h> 51 #include <net/socket_parse.h> 52 #include <net/ip_codes.h> 53 54 #include "print_error.h" 55 56 #define NAME "ping" 57 58 #define CL_OK 0 59 #define CL_USAGE -1 60 #define CL_MISSING -2 61 #define CL_INVALID -3 62 #define CL_UNSUPPORTED -4 63 #define CL_ERROR -5 64 65 /** Ping configuration 66 * 67 */ 68 typedef struct { 69 bool verbose; /**< Verbose printouts. */ 70 size_t size; /**< Outgoing packet size. */ 71 unsigned int count; /**< Number of packets to send. */ 72 suseconds_t timeout; /**< Reply wait timeout. */ 73 int af; /**< Address family. */ 74 ip_tos_t tos; /**< Type of service. */ 75 ip_ttl_t ttl; /**< Time-to-live. */ 76 bool fragments; /**< Fragmentation. */ 77 78 char *dest_addr; /**< Destination address. */ 79 struct sockaddr_in dest; /**< IPv4 destionation. */ 80 struct sockaddr_in6 dest6; /**< IPv6 destionation. */ 81 82 struct sockaddr *dest_raw; /**< Raw destination address. */ 83 socklen_t dest_len; /**< Raw destination address length. */ 84 85 /** Converted address string. */ 86 char dest_str[INET6_ADDRSTRLEN]; 87 } ping_config_t; 88 89 90 static void usage(void) 91 { 92 printf( 93 "Usage: ping [-c count] [-s size] [-W timeout] [-f family] [-t ttl]\n" \ 94 " [-Q tos] [--dont_fragment] destination\n" \ 95 "\n" \ 96 "Options:\n" \ 97 "\t-c count\n" \ 98 "\t--count=count\n" \ 99 "\t\tNumber of outgoing packets (default: 4)\n" \ 100 "\n" \ 101 "\t-s size\n" \ 102 "\t--size=bytes\n" \ 103 "\t\tOutgoing packet size (default: 56 bytes)\n" \ 104 "\n" \ 105 "\t-W timeout\n" \ 106 "\t--timeout=ms\n" \ 107 "\t\tReply wait timeout (default: 3000 ms)\n" \ 108 "\n" \ 109 "\t-f family\n" \ 110 "\t--family=family\n" \ 111 "\t\tDestination address family, AF_INET or AF_INET6 (default: AF_INET)\n" \ 112 "\n" \ 113 "\t-t ttl\n" \ 114 "\t--ttl=ttl\n" \ 115 "\t\tOutgoing packet time-to-live (default: 0)\n" \ 116 "\n" \ 117 "\t-Q tos\n" \ 118 "\t--tos=tos\n" \ 119 "\t\tOutgoing packet type of service (default: 0)\n" \ 120 "\n" \ 121 "\t--dont_fragment\n" \ 122 "\t\tDisable packet fragmentation (default: enabled)\n" \ 123 "\n" \ 124 "\t-v\n" \ 125 "\t--verbose\n" \ 126 "\t\tVerbose operation\n" \ 127 "\n" \ 128 "\t-h\n" \ 129 "\t--help\n" \ 130 "\t\tPrint this usage information\n" 131 ); 132 } 133 134 static int args_parse(int argc, char *argv[], ping_config_t *config) 135 { 136 if (argc < 2) 137 return CL_USAGE; 138 42 #include <stdlib.h> 43 #include <sys/types.h> 44 45 #define NAME "ping" 46 47 /** Delay between subsequent ping requests in microseconds */ 48 #define PING_DELAY (1000 * 1000) 49 50 /** Ping request timeout in microseconds */ 51 #define PING_TIMEOUT (1000 * 1000) 52 53 static int ping_ev_recv(inetping_sdu_t *); 54 55 static bool done = false; 56 static FIBRIL_CONDVAR_INITIALIZE(done_cv); 57 static FIBRIL_MUTEX_INITIALIZE(done_lock); 58 59 static inetping_ev_ops_t ev_ops = { 60 .recv = ping_ev_recv 61 }; 62 63 static inet_addr_t src_addr; 64 static inet_addr_t dest_addr; 65 66 static bool ping_repeat = false; 67 68 static void print_syntax(void) 69 { 70 printf("syntax: " NAME " [-r] <addr>\n"); 71 } 72 73 static int addr_parse(const char *text, inet_addr_t *addr) 74 { 75 unsigned long a[4]; 76 char *cp = (char *)text; 139 77 int i; 140 int ret; 141 142 for (i = 1; i < argc; i++) { 143 144 /* Not an option */ 145 if (argv[i][0] != '-') 78 79 for (i = 0; i < 3; i++) { 80 a[i] = strtoul(cp, &cp, 10); 81 if (*cp != '.') 82 return EINVAL; 83 ++cp; 84 } 85 86 a[3] = strtoul(cp, &cp, 10); 87 if (*cp != '\0') 88 return EINVAL; 89 90 addr->ipv4 = 0; 91 for (i = 0; i < 4; i++) { 92 if (a[i] > 255) 93 return EINVAL; 94 addr->ipv4 = (addr->ipv4 << 8) | a[i]; 95 } 96 97 return EOK; 98 } 99 100 static int addr_format(inet_addr_t *addr, char **bufp) 101 { 102 int rc; 103 104 rc = asprintf(bufp, "%d.%d.%d.%d", addr->ipv4 >> 24, 105 (addr->ipv4 >> 16) & 0xff, (addr->ipv4 >> 8) & 0xff, 106 addr->ipv4 & 0xff); 107 108 if (rc < 0) 109 return ENOMEM; 110 111 return EOK; 112 } 113 114 static void ping_signal_done(void) 115 { 116 fibril_mutex_lock(&done_lock); 117 done = true; 118 fibril_mutex_unlock(&done_lock); 119 fibril_condvar_broadcast(&done_cv); 120 } 121 122 static int ping_ev_recv(inetping_sdu_t *sdu) 123 { 124 char *asrc, *adest; 125 int rc; 126 127 rc = addr_format(&sdu->src, &asrc); 128 if (rc != EOK) 129 return ENOMEM; 130 131 rc = addr_format(&sdu->dest, &adest); 132 if (rc != EOK) { 133 free(asrc); 134 return ENOMEM; 135 } 136 printf("Received ICMP echo reply: from %s to %s, seq. no %u, " 137 "payload size %zu\n", asrc, adest, sdu->seq_no, sdu->size); 138 139 if (!ping_repeat) { 140 ping_signal_done(); 141 } 142 143 free(asrc); 144 free(adest); 145 return EOK; 146 } 147 148 static int ping_send(uint16_t seq_no) 149 { 150 inetping_sdu_t sdu; 151 int rc; 152 153 sdu.src = src_addr; 154 sdu.dest = dest_addr; 155 sdu.seq_no = seq_no; 156 sdu.data = (void *) "foo"; 157 sdu.size = 3; 158 159 rc = inetping_send(&sdu); 160 if (rc != EOK) { 161 printf(NAME ": Failed sending echo request (%d).\n", rc); 162 return rc; 163 } 164 165 return EOK; 166 } 167 168 static int transmit_fibril(void *arg) 169 { 170 uint16_t seq_no = 0; 171 172 while (true) { 173 fibril_mutex_lock(&done_lock); 174 if (done) { 175 fibril_mutex_unlock(&done_lock); 176 return 0; 177 } 178 fibril_mutex_unlock(&done_lock); 179 180 (void) ping_send(++seq_no); 181 async_usleep(PING_DELAY); 182 } 183 184 return 0; 185 } 186 187 static int input_fibril(void *arg) 188 { 189 console_ctrl_t *con; 190 kbd_event_t ev; 191 192 con = console_init(stdin, stdout); 193 printf("[Press Ctrl-Q to quit]\n"); 194 195 while (true) { 196 if (!console_get_kbd_event(con, &ev)) 146 197 break; 147 148 /* Options terminator */ 149 if (str_cmp(argv[i], "--") == 0) { 150 i++; 151 break; 152 } 153 154 int off; 155 156 /* Usage */ 157 if ((off = arg_parse_short_long(argv[i], "-h", "--help")) != -1) 158 return CL_USAGE; 159 160 /* Verbose */ 161 if ((off = arg_parse_short_long(argv[i], "-v", "--verbose")) != -1) { 162 config->verbose = true; 163 continue; 164 } 165 166 /* Don't fragment */ 167 if (str_cmp(argv[i], "--dont_fragment") == 0) { 168 config->fragments = false; 169 continue; 170 } 171 172 /* Count */ 173 if ((off = arg_parse_short_long(argv[i], "-c", "--count=")) != -1) { 174 int tmp; 175 ret = arg_parse_int(argc, argv, &i, &tmp, off); 176 177 if ((ret != EOK) || (tmp < 0)) 178 return i; 179 180 config->count = (unsigned int) tmp; 181 continue; 182 } 183 184 /* Outgoing packet size */ 185 if ((off = arg_parse_short_long(argv[i], "-s", "--size=")) != -1) { 186 int tmp; 187 ret = arg_parse_int(argc, argv, &i, &tmp, off); 188 189 if ((ret != EOK) || (tmp < 0)) 190 return i; 191 192 config->size = (size_t) tmp; 193 continue; 194 } 195 196 /* Reply wait timeout */ 197 if ((off = arg_parse_short_long(argv[i], "-W", "--timeout=")) != -1) { 198 int tmp; 199 ret = arg_parse_int(argc, argv, &i, &tmp, off); 200 201 if ((ret != EOK) || (tmp < 0)) 202 return i; 203 204 config->timeout = (suseconds_t) tmp; 205 continue; 206 } 207 208 /* Address family */ 209 if ((off = arg_parse_short_long(argv[i], "-f", "--family=")) != -1) { 210 ret = arg_parse_name_int(argc, argv, &i, &config->af, off, 211 socket_parse_address_family); 212 213 if (ret != EOK) 214 return i; 215 216 continue; 217 } 218 219 /* Type of service */ 220 if ((off = arg_parse_short_long(argv[i], "-Q", "--tos=")) != -1) { 221 int tmp; 222 ret = arg_parse_name_int(argc, argv, &i, &tmp, off, 223 socket_parse_address_family); 224 225 if ((ret != EOK) || (tmp < 0)) 226 return i; 227 228 config->tos = (ip_tos_t) tmp; 229 continue; 230 } 231 232 /* Time to live */ 233 if ((off = arg_parse_short_long(argv[i], "-t", "--ttl=")) != -1) { 234 int tmp; 235 ret = arg_parse_name_int(argc, argv, &i, &tmp, off, 236 socket_parse_address_family); 237 238 if ((ret != EOK) || (tmp < 0)) 239 return i; 240 241 config->ttl = (ip_ttl_t) tmp; 242 continue; 243 } 244 } 245 246 if (i >= argc) 247 return CL_MISSING; 248 249 config->dest_addr = argv[i]; 250 251 /* Resolve destionation address */ 252 switch (config->af) { 253 case AF_INET: 254 config->dest_raw = (struct sockaddr *) &config->dest; 255 config->dest_len = sizeof(config->dest); 256 config->dest.sin_family = config->af; 257 ret = inet_pton(config->af, config->dest_addr, 258 (uint8_t *) &config->dest.sin_addr.s_addr); 259 break; 260 case AF_INET6: 261 config->dest_raw = (struct sockaddr *) &config->dest6; 262 config->dest_len = sizeof(config->dest6); 263 config->dest6.sin6_family = config->af; 264 ret = inet_pton(config->af, config->dest_addr, 265 (uint8_t *) &config->dest6.sin6_addr.s6_addr); 266 break; 267 default: 268 return CL_UNSUPPORTED; 269 } 270 271 if (ret != EOK) 272 return CL_INVALID; 273 274 /* Convert destination address back to string */ 275 switch (config->af) { 276 case AF_INET: 277 ret = inet_ntop(config->af, 278 (uint8_t *) &config->dest.sin_addr.s_addr, 279 config->dest_str, sizeof(config->dest_str)); 280 break; 281 case AF_INET6: 282 ret = inet_ntop(config->af, 283 (uint8_t *) &config->dest6.sin6_addr.s6_addr, 284 config->dest_str, sizeof(config->dest_str)); 285 break; 286 default: 287 return CL_UNSUPPORTED; 288 } 289 290 if (ret != EOK) 291 return CL_ERROR; 292 293 return CL_OK; 198 199 if (ev.type == KEY_PRESS && (ev.mods & (KM_ALT | KM_SHIFT)) == 200 0 && (ev.mods & KM_CTRL) != 0) { 201 /* Ctrl+key */ 202 if (ev.key == KC_Q) { 203 ping_signal_done(); 204 return 0; 205 } 206 } 207 } 208 209 return 0; 294 210 } 295 211 296 212 int main(int argc, char *argv[]) 297 213 { 298 ping_config_t config; 299 300 /* Default configuration */ 301 config.verbose = false; 302 config.size = 56; 303 config.count = 4; 304 config.timeout = 3000; 305 config.af = AF_INET; 306 config.tos = 0; 307 config.ttl = 0; 308 config.fragments = true; 309 310 int ret = args_parse(argc, argv, &config); 311 312 switch (ret) { 313 case CL_OK: 314 break; 315 case CL_USAGE: 316 usage(); 317 return 0; 318 case CL_MISSING: 319 fprintf(stderr, "%s: Destination address missing\n", NAME); 320 return 1; 321 case CL_INVALID: 322 fprintf(stderr, "%s: Destination address '%s' invalid or malformed\n", 323 NAME, config.dest_addr); 324 return 2; 325 case CL_UNSUPPORTED: 326 fprintf(stderr, "%s: Destination address '%s' unsupported\n", 327 NAME, config.dest_addr); 328 return 3; 329 case CL_ERROR: 330 fprintf(stderr, "%s: Destination address '%s' error\n", 331 NAME, config.dest_addr); 332 return 4; 333 default: 334 fprintf(stderr, "%s: Unknown or invalid option '%s'\n", NAME, 335 argv[ret]); 336 return 5; 337 } 338 339 printf("PING %s (%s) %zu(%zu) bytes of data\n", config.dest_addr, 340 config.dest_str, config.size, config.size); 341 342 async_sess_t *sess = icmp_connect_module(); 343 if (!sess) { 344 fprintf(stderr, "%s: Unable to connect to ICMP service (%s)\n", NAME, 345 str_error(errno)); 346 return errno; 347 } 348 349 unsigned int seq; 350 for (seq = 0; seq < config.count; seq++) { 351 struct timeval t0; 352 ret = gettimeofday(&t0, NULL); 353 if (ret != EOK) { 354 fprintf(stderr, "%s: gettimeofday failed (%s)\n", NAME, 355 str_error(ret)); 356 357 async_hangup(sess); 358 return ret; 359 } 360 361 /* Ping! */ 362 int result = icmp_echo_msg(sess, config.size, config.timeout, 363 config.ttl, config.tos, !config.fragments, config.dest_raw, 364 config.dest_len); 365 366 struct timeval t1; 367 ret = gettimeofday(&t1, NULL); 368 if (ret != EOK) { 369 fprintf(stderr, "%s: gettimeofday failed (%s)\n", NAME, 370 str_error(ret)); 371 372 async_hangup(sess); 373 return ret; 374 } 375 376 suseconds_t elapsed = tv_sub(&t1, &t0); 377 378 switch (result) { 379 case ICMP_ECHO: 380 printf("%zu bytes from ? (?): icmp_seq=%u ttl=? time=%ld.%04ld\n", 381 config.size, seq, elapsed / 1000, elapsed % 1000); 382 break; 383 case ETIMEOUT: 384 printf("%zu bytes from ? (?): icmp_seq=%u Timed out\n", 385 config.size, seq); 386 break; 387 default: 388 print_error(stdout, result, NULL, "\n"); 389 } 390 } 391 392 async_hangup(sess); 393 214 int rc; 215 int argi; 216 217 rc = inetping_init(&ev_ops); 218 if (rc != EOK) { 219 printf(NAME ": Failed connecting to internet ping service " 220 "(%d).\n", rc); 221 return 1; 222 } 223 224 argi = 1; 225 if (argi < argc && str_cmp(argv[argi], "-r") == 0) { 226 ping_repeat = true; 227 ++argi; 228 } else { 229 ping_repeat = false; 230 } 231 232 if (argc - argi != 1) { 233 print_syntax(); 234 return 1; 235 } 236 237 /* Parse destination address */ 238 rc = addr_parse(argv[argi], &dest_addr); 239 if (rc != EOK) { 240 printf(NAME ": Invalid address format.\n"); 241 print_syntax(); 242 return 1; 243 } 244 245 /* Determine source address */ 246 rc = inetping_get_srcaddr(&dest_addr, &src_addr); 247 if (rc != EOK) { 248 printf(NAME ": Failed determining source address.\n"); 249 return 1; 250 } 251 252 fid_t fid; 253 254 if (ping_repeat) { 255 fid = fibril_create(transmit_fibril, NULL); 256 if (fid == 0) { 257 printf(NAME ": Failed creating transmit fibril.\n"); 258 return 1; 259 } 260 261 fibril_add_ready(fid); 262 263 fid = fibril_create(input_fibril, NULL); 264 if (fid == 0) { 265 printf(NAME ": Failed creating input fibril.\n"); 266 return 1; 267 } 268 269 fibril_add_ready(fid); 270 } else { 271 ping_send(1); 272 } 273 274 fibril_mutex_lock(&done_lock); 275 rc = EOK; 276 while (!done && rc != ETIMEOUT) { 277 rc = fibril_condvar_wait_timeout(&done_cv, &done_lock, 278 ping_repeat ? 0 : PING_TIMEOUT); 279 } 280 fibril_mutex_unlock(&done_lock); 281 282 if (rc == ETIMEOUT) { 283 printf(NAME ": Echo request timed out.\n"); 284 return 1; 285 } 286 394 287 return 0; 395 288 } -
uspace/app/tester/print/print1.c
r3d93289a r0c37135 42 42 43 43 TPRINTF("Testing printf(\"%%8.10s\", \"text\"):\n"); 44 TPRINTF("Expected output: \" text\"\n");44 TPRINTF("Expected output: \" text\"\n"); 45 45 TPRINTF("Real output: \"%8.10s\"\n\n", "text"); 46 46 … … 49 49 TPRINTF("Real output: \"%8.10s\"\n\n", "very long text"); 50 50 51 TPRINTF("Testing printf(\"%%-*.*s\", 7, 7, \"text\"):\n"); 52 TPRINTF("Expected output: \"text \"\n"); 53 TPRINTF("Real output: \"%-*.*s\"\n\n", 7, 7, "text"); 54 51 55 return NULL; 52 56 } -
uspace/app/top/screen.c
r3d93289a r0c37135 37 37 38 38 #include <stdio.h> 39 #include <stdlib.h> 39 40 #include <io/console.h> 40 41 #include <io/style.h> … … 43 44 #include <stats.h> 44 45 #include <inttypes.h> 46 #include <macros.h> 45 47 #include "screen.h" 46 48 #include "top.h" … … 48 50 #define USEC_COUNT 1000000 49 51 50 static sysarg_t warn_col = 0;51 static sysarg_t warn_row = 0;52 52 static suseconds_t timeleft = 0; 53 53 54 54 console_ctrl_t *console; 55 55 56 static sysarg_t warning_col = 0; 57 static sysarg_t warning_row = 0; 58 static suseconds_t warning_timeleft = 0; 59 static char *warning_text = NULL; 60 56 61 static void screen_style_normal(void) 57 62 { … … 64 69 console_flush(console); 65 70 console_set_style(console, STYLE_INVERTED); 71 } 72 73 static void screen_style_emphasis(void) 74 { 75 console_flush(console); 76 console_set_style(console, STYLE_EMPHASIS); 66 77 } 67 78 … … 126 137 void screen_done(void) 127 138 { 139 free(warning_text); 140 warning_text = NULL; 141 128 142 screen_restart(true); 129 143 … … 277 291 } 278 292 279 static inline void print_ tasks_head(void)293 static inline void print_help_head(void) 280 294 { 281 295 screen_style_inverted(); 282 printf("[taskid] [thrds] [resident] [%%resi] [virtual] [%%virt]" 283 " [%%user] [%%kern] [name"); 296 printf("Help"); 284 297 screen_newline(); 285 298 screen_style_normal(); 286 299 } 287 300 288 static inline void print_tasks(data_t *data) 289 { 290 sysarg_t cols; 291 sysarg_t rows; 292 screen_get_size(&cols, &rows); 301 static inline void print_help(void) 302 { 303 sysarg_t cols; 304 sysarg_t rows; 305 screen_get_size(&cols, &rows); 306 307 screen_newline(); 308 309 printf("Operation modes:"); 310 screen_newline(); 311 312 printf(" t .. tasks statistics"); 313 screen_newline(); 314 315 printf(" i .. IPC statistics"); 316 screen_newline(); 317 318 printf(" e .. exceptions statistics"); 319 screen_newline(); 320 321 printf(" a .. toggle display of all/hot exceptions"); 322 screen_newline(); 323 324 printf(" h .. toggle this help screen"); 325 screen_newline(); 326 327 screen_newline(); 328 329 printf("Other keys:"); 330 screen_newline(); 331 332 printf(" s .. choose column to sort by"); 333 screen_newline(); 334 335 printf(" r .. toggle reversed sorting"); 336 screen_newline(); 337 338 printf(" q .. quit"); 339 screen_newline(); 293 340 294 341 sysarg_t col; … … 296 343 screen_get_pos(&col, &row); 297 344 298 size_t i;299 for (i = 0; (i < data->tasks_count) && (row < rows); i++, row++) {300 stats_task_t *task = data->tasks + data->tasks_map[i];301 perc_task_t *perc = data->tasks_perc + data->tasks_map[i];302 303 uint64_t resmem;304 const char *resmem_suffix;305 bin_order_suffix(task->resmem, &resmem, &resmem_suffix, true);306 307 uint64_t virtmem;308 const char *virtmem_suffix;309 bin_order_suffix(task->virtmem, &virtmem, &virtmem_suffix, true);310 311 printf("%-8" PRIu64 " %7zu %7" PRIu64 "%s ",312 task->task_id, task->threads, resmem, resmem_suffix);313 print_percent(perc->resmem, 2);314 printf(" %6" PRIu64 "%s ", virtmem, virtmem_suffix);315 print_percent(perc->virtmem, 2);316 puts(" ");317 print_percent(perc->ucycles, 2);318 puts(" ");319 print_percent(perc->kcycles, 2);320 puts(" ");321 print_string(task->name);322 323 screen_newline();324 }325 326 345 while (row < rows) { 327 346 screen_newline(); … … 330 349 } 331 350 332 static inline void print_ipc_head(void) 333 { 351 static inline void print_table_head(const table_t *table) 352 { 353 sysarg_t cols; 354 sysarg_t rows; 355 screen_get_size(&cols, &rows); 356 334 357 screen_style_inverted(); 335 printf("[taskid] [cls snt] [cls rcv] [ans snt]" 336 " [ans rcv] [irq rcv] [forward] [name"); 358 for (size_t i = 0; i < table->num_columns; i++) { 359 const char *name = table->columns[i].name; 360 int width = table->columns[i].width; 361 if (i != 0) { 362 puts(" "); 363 } 364 if (width == 0) { 365 sysarg_t col; 366 sysarg_t row; 367 screen_get_pos(&col, &row); 368 width = cols - col - 1; 369 } 370 printf("[%-*.*s]", width - 2, width - 2, name); 371 } 337 372 screen_newline(); 338 373 screen_style_normal(); 339 374 } 340 375 341 static inline void print_ ipc(data_t *data)376 static inline void print_table(const table_t *table) 342 377 { 343 378 sysarg_t cols; … … 350 385 351 386 size_t i; 352 for (i = 0; (i < data->tasks_count) && (row < rows); i++, row++) { 353 uint64_t call_sent; 354 uint64_t call_received; 355 uint64_t answer_sent; 356 uint64_t answer_received; 357 uint64_t irq_notif_received; 358 uint64_t forwarded; 359 360 char call_sent_suffix; 361 char call_received_suffix; 362 char answer_sent_suffix; 363 char answer_received_suffix; 364 char irq_notif_received_suffix; 365 char forwarded_suffix; 366 367 order_suffix(data->tasks[i].ipc_info.call_sent, &call_sent, 368 &call_sent_suffix); 369 order_suffix(data->tasks[i].ipc_info.call_received, 370 &call_received, &call_received_suffix); 371 order_suffix(data->tasks[i].ipc_info.answer_sent, 372 &answer_sent, &answer_sent_suffix); 373 order_suffix(data->tasks[i].ipc_info.answer_received, 374 &answer_received, &answer_received_suffix); 375 order_suffix(data->tasks[i].ipc_info.irq_notif_received, 376 &irq_notif_received, &irq_notif_received_suffix); 377 order_suffix(data->tasks[i].ipc_info.forwarded, &forwarded, 378 &forwarded_suffix); 379 380 printf("%-8" PRIu64 " %8" PRIu64 "%c %8" PRIu64 "%c" 381 " %8" PRIu64 "%c %8" PRIu64 "%c %8" PRIu64 "%c" 382 " %8" PRIu64 "%c ", data->tasks[i].task_id, 383 call_sent, call_sent_suffix, 384 call_received, call_received_suffix, 385 answer_sent, answer_sent_suffix, 386 answer_received, answer_received_suffix, 387 irq_notif_received, irq_notif_received_suffix, 388 forwarded, forwarded_suffix); 389 print_string(data->tasks[i].name); 390 391 screen_newline(); 387 for (i = 0; (i < table->num_fields) && (row < rows); i++) { 388 size_t column_index = i % table->num_columns; 389 int width = table->columns[column_index].width; 390 field_t *field = &table->fields[i]; 391 392 if (column_index != 0) { 393 puts(" "); 394 } 395 396 if (width == 0) { 397 screen_get_pos(&col, &row); 398 width = cols - col - 1; 399 } 400 401 switch (field->type) { 402 case FIELD_EMPTY: 403 printf("%*s", width, ""); 404 break; 405 case FIELD_UINT: 406 printf("%*" PRIu64, width, field->uint); 407 break; 408 case FIELD_UINT_SUFFIX_BIN: { 409 uint64_t val = field->uint; 410 const char *suffix; 411 width -= 3; 412 bin_order_suffix(val, &val, &suffix, true); 413 printf("%*" PRIu64 "%s", width, val, suffix); 414 break; 415 } 416 case FIELD_UINT_SUFFIX_DEC: { 417 uint64_t val = field->uint; 418 char suffix; 419 width -= 1; 420 order_suffix(val, &val, &suffix); 421 printf("%*" PRIu64 "%c", width, val, suffix); 422 break; 423 } 424 case FIELD_PERCENT: 425 width -= 5; /* nnn.% */ 426 if (width > 2) { 427 printf("%*s", width - 2, ""); 428 width = 2; 429 } 430 print_percent(field->fixed, width); 431 break; 432 case FIELD_STRING: 433 printf("%-*.*s", width, width, field->string); 434 break; 435 } 436 437 if (column_index == table->num_columns - 1) { 438 screen_newline(); 439 row++; 440 } 392 441 } 393 442 … … 398 447 } 399 448 400 static inline void print_excs_head(void) 401 { 402 screen_style_inverted(); 403 printf("[exc ] [count ] [%%count] [cycles ] [%%cycles] [description"); 404 screen_newline(); 405 screen_style_normal(); 406 } 407 408 static inline void print_excs(data_t *data) 449 static inline void print_sort(table_t *table) 409 450 { 410 451 sysarg_t cols; … … 415 456 sysarg_t row; 416 457 screen_get_pos(&col, &row); 417 418 size_t i; 419 for (i = 0; (i < data->exceptions_count) && (row < rows); i++) { 420 /* Filter-out cold exceptions if not instructed otherwise */ 421 if ((!excs_all) && (!data->exceptions[i].hot)) 422 continue; 423 424 uint64_t count; 425 uint64_t cycles; 426 427 char count_suffix; 428 char cycles_suffix; 429 430 order_suffix(data->exceptions[i].count, &count, &count_suffix); 431 order_suffix(data->exceptions[i].cycles, &cycles, &cycles_suffix); 432 433 printf("%-8u %9" PRIu64 "%c ", 434 data->exceptions[i].id, count, count_suffix); 435 print_percent(data->exceptions_perc[i].count, 2); 436 printf(" %9" PRIu64 "%c ", cycles, cycles_suffix); 437 print_percent(data->exceptions_perc[i].cycles, 2); 438 puts(" "); 439 print_string(data->exceptions[i].desc); 440 458 459 size_t num = min(table->num_columns, rows - row); 460 for (size_t i = 0; i < num; i++) { 461 printf("%c - %s", table->columns[i].key, table->columns[i].name); 441 462 screen_newline(); 442 463 row++; … … 449 470 } 450 471 451 static void print_help(void) 452 { 453 sysarg_t cols; 454 sysarg_t rows; 455 screen_get_size(&cols, &rows); 456 457 sysarg_t col; 458 sysarg_t row; 459 screen_get_pos(&col, &row); 460 461 screen_newline(); 462 463 printf("Operation modes:"); 464 screen_newline(); 465 466 printf(" t .. tasks statistics"); 467 screen_newline(); 468 469 printf(" i .. IPC statistics"); 470 screen_newline(); 471 472 printf(" e .. exceptions statistics"); 473 screen_newline(); 474 475 printf(" a .. toggle display of all/hot exceptions"); 476 screen_newline(); 477 478 row += 6; 479 480 while (row < rows) { 481 screen_newline(); 482 row++; 483 } 472 static inline void print_warning(void) 473 { 474 screen_get_pos(&warning_col, &warning_row); 475 if (warning_timeleft > 0) { 476 screen_style_emphasis(); 477 print_string(warning_text); 478 screen_style_normal(); 479 } else { 480 free(warning_text); 481 warning_text = NULL; 482 } 483 screen_newline(); 484 484 } 485 485 … … 492 492 print_cpu_info(data); 493 493 print_physmem_info(data); 494 495 /* Empty row for warnings */ 496 screen_get_pos(&warn_col, &warn_row); 497 screen_newline(); 498 499 switch (op_mode) { 500 case OP_TASKS: 501 print_tasks_head(); 502 print_tasks(data); 494 print_warning(); 495 496 switch (screen_mode) { 497 case SCREEN_TABLE: 498 print_table_head(&data->table); 499 print_table(&data->table); 503 500 break; 504 case OP_IPC: 505 print_ipc_head(); 506 print_ipc(data); 501 case SCREEN_SORT: 502 print_sort(&data->table); 507 503 break; 508 case OP_EXCS: 509 print_excs_head(); 510 print_excs(data); 511 break; 512 case OP_HELP: 513 print_tasks_head(); 504 case SCREEN_HELP: 505 print_help_head(); 514 506 print_help(); 515 507 } … … 518 510 } 519 511 520 void print_warning(const char *fmt, ...) 521 { 522 screen_moveto(warn_col, warn_row); 523 512 void show_warning(const char *fmt, ...) 513 { 514 sysarg_t cols; 515 sysarg_t rows; 516 screen_get_size(&cols, &rows); 517 518 size_t warning_text_size = 1 + cols * sizeof(*warning_text); 519 free(warning_text); 520 warning_text = malloc(warning_text_size); 521 if (!warning_text) 522 return; 523 524 524 va_list args; 525 525 va_start(args, fmt); 526 v printf(fmt, args);526 vsnprintf(warning_text, warning_text_size, fmt, args); 527 527 va_end(args); 528 528 529 screen_newline(); 529 warning_timeleft = 2 * USEC_COUNT; 530 531 screen_moveto(warning_col, warning_row); 532 print_warning(); 530 533 console_flush(console); 531 534 } … … 555 558 kbd_event_t event; 556 559 560 warning_timeleft -= timeleft; 557 561 if (!console_get_kbd_event_timeout(console, &event, &timeleft)) { 558 562 timeleft = 0; 559 563 return -1; 560 564 } 565 warning_timeleft += timeleft; 561 566 562 567 if (event.type == KEY_PRESS) -
uspace/app/top/screen.h
r3d93289a r0c37135 43 43 extern void screen_done(void); 44 44 extern void print_data(data_t *); 45 extern void print_warning(const char *, ...);45 extern void show_warning(const char *, ...); 46 46 47 47 extern int tgetchar(unsigned int); -
uspace/app/top/top.c
r3d93289a r0c37135 55 55 #define MINUTE 60 56 56 57 op_mode_t op_mode = OP_TASKS; 58 sort_mode_t sort_mode = SORT_TASK_CYCLES; 59 bool excs_all = false; 57 typedef enum { 58 OP_TASKS, 59 OP_IPC, 60 OP_EXCS, 61 } op_mode_t; 62 63 static const column_t task_columns[] = { 64 {"taskid", 't', 8}, 65 {"thrds", 'h', 7}, 66 {"resident", 'r', 10}, 67 {"%resi", 'R', 7}, 68 {"virtual", 'v', 9}, 69 {"%virt", 'V', 7}, 70 {"%user", 'U', 7}, 71 {"%kern", 'K', 7}, 72 {"name", 'd', 0}, 73 }; 74 75 enum { 76 TASK_COL_ID = 0, 77 TASK_COL_NUM_THREADS, 78 TASK_COL_RESIDENT, 79 TASK_COL_PERCENT_RESIDENT, 80 TASK_COL_VIRTUAL, 81 TASK_COL_PERCENT_VIRTUAL, 82 TASK_COL_PERCENT_USER, 83 TASK_COL_PERCENT_KERNEL, 84 TASK_COL_NAME, 85 TASK_NUM_COLUMNS, 86 }; 87 88 static const column_t ipc_columns[] = { 89 {"taskid", 't', 8}, 90 {"cls snt", 'c', 9}, 91 {"cls rcv", 'C', 9}, 92 {"ans snt", 'a', 9}, 93 {"ans rcv", 'A', 9}, 94 {"forward", 'f', 9}, 95 {"name", 'd', 0}, 96 }; 97 98 enum { 99 IPC_COL_TASKID = 0, 100 IPC_COL_CLS_SNT, 101 IPC_COL_CLS_RCV, 102 IPC_COL_ANS_SNT, 103 IPC_COL_ANS_RCV, 104 IPC_COL_FORWARD, 105 IPC_COL_NAME, 106 IPC_NUM_COLUMNS, 107 }; 108 109 static const column_t exception_columns[] = { 110 {"exc", 'e', 8}, 111 {"count", 'n', 10}, 112 {"%count", 'N', 8}, 113 {"cycles", 'c', 10}, 114 {"%cycles", 'C', 9}, 115 {"description", 'd', 0}, 116 }; 117 118 enum { 119 EXCEPTION_COL_ID = 0, 120 EXCEPTION_COL_COUNT, 121 EXCEPTION_COL_PERCENT_COUNT, 122 EXCEPTION_COL_CYCLES, 123 EXCEPTION_COL_PERCENT_CYCLES, 124 EXCEPTION_COL_DESCRIPTION, 125 EXCEPTION_NUM_COLUMNS, 126 }; 127 128 screen_mode_t screen_mode = SCREEN_TABLE; 129 static op_mode_t op_mode = OP_TASKS; 130 static size_t sort_column = TASK_COL_PERCENT_USER; 131 static int sort_reverse = -1; 132 static bool excs_all = false; 60 133 61 134 static const char *read_data(data_t *target) … … 67 140 target->tasks = NULL; 68 141 target->tasks_perc = NULL; 69 target->tasks_map = NULL;70 142 target->threads = NULL; 71 143 target->exceptions = NULL; … … 76 148 target->ecycles_diff = NULL; 77 149 target->ecount_diff = NULL; 150 target->table.name = NULL; 151 target->table.num_columns = 0; 152 target->table.columns = NULL; 153 target->table.num_fields = 0; 154 target->table.fields = NULL; 78 155 79 156 /* Get current time */ … … 117 194 if (target->tasks_perc == NULL) 118 195 return "Not enough memory for task utilization"; 119 120 target->tasks_map =121 (size_t *) calloc(target->tasks_count, sizeof(size_t));122 if (target->tasks_map == NULL)123 return "Not enough memory for task map";124 196 125 197 /* Get threads */ … … 289 361 static int cmp_data(void *a, void *b, void *arg) 290 362 { 291 size_t ia = *((size_t *) a); 292 size_t ib = *((size_t *) b); 293 data_t *data = (data_t *) arg; 294 295 uint64_t acycles = data->ucycles_diff[ia] + data->kcycles_diff[ia]; 296 uint64_t bcycles = data->ucycles_diff[ib] + data->kcycles_diff[ib]; 297 298 if (acycles > bcycles) 299 return -1; 300 301 if (acycles < bcycles) 302 return 1; 303 363 field_t *fa = (field_t *)a + sort_column; 364 field_t *fb = (field_t *)b + sort_column; 365 366 if (fa->type > fb->type) 367 return 1 * sort_reverse; 368 369 if (fa->type < fb->type) 370 return -1 * sort_reverse; 371 372 switch (fa->type) { 373 case FIELD_EMPTY: 374 return 0; 375 case FIELD_UINT_SUFFIX_BIN: /* fallthrough */ 376 case FIELD_UINT_SUFFIX_DEC: /* fallthrough */ 377 case FIELD_UINT: 378 if (fa->uint > fb->uint) 379 return 1 * sort_reverse; 380 if (fa->uint < fb->uint) 381 return -1 * sort_reverse; 382 return 0; 383 case FIELD_PERCENT: 384 if (fa->fixed.upper * fb->fixed.lower 385 > fb->fixed.upper * fa->fixed.lower) 386 return 1 * sort_reverse; 387 if (fa->fixed.upper * fb->fixed.lower 388 < fb->fixed.upper * fa->fixed.lower) 389 return -1 * sort_reverse; 390 return 0; 391 case FIELD_STRING: 392 return str_cmp(fa->string, fb->string) * sort_reverse; 393 } 394 304 395 return 0; 305 396 } 306 397 307 static void sort_data(data_t *data) 308 { 309 size_t i; 310 311 for (i = 0; i < data->tasks_count; i++) 312 data->tasks_map[i] = i; 313 314 qsort((void *) data->tasks_map, data->tasks_count, 315 sizeof(size_t), cmp_data, (void *) data); 398 static void sort_table(table_t *table) 399 { 400 if (sort_column >= table->num_columns) 401 sort_column = 0; 402 /* stable sort is probably best, so we use gsort */ 403 gsort((void *) table->fields, table->num_fields / table->num_columns, 404 sizeof(field_t) * table->num_columns, cmp_data, NULL); 405 } 406 407 static const char *fill_task_table(data_t *data) 408 { 409 data->table.name = "Tasks"; 410 data->table.num_columns = TASK_NUM_COLUMNS; 411 data->table.columns = task_columns; 412 data->table.num_fields = data->tasks_count * TASK_NUM_COLUMNS; 413 data->table.fields = calloc(data->table.num_fields, 414 sizeof(field_t)); 415 if (data->table.fields == NULL) 416 return "Not enough memory for table fields"; 417 418 field_t *field = data->table.fields; 419 for (size_t i = 0; i < data->tasks_count; i++) { 420 stats_task_t *task = &data->tasks[i]; 421 perc_task_t *perc = &data->tasks_perc[i]; 422 field[TASK_COL_ID].type = FIELD_UINT; 423 field[TASK_COL_ID].uint = task->task_id; 424 field[TASK_COL_NUM_THREADS].type = FIELD_UINT; 425 field[TASK_COL_NUM_THREADS].uint = task->threads; 426 field[TASK_COL_RESIDENT].type = FIELD_UINT_SUFFIX_BIN; 427 field[TASK_COL_RESIDENT].uint = task->resmem; 428 field[TASK_COL_PERCENT_RESIDENT].type = FIELD_PERCENT; 429 field[TASK_COL_PERCENT_RESIDENT].fixed = perc->resmem; 430 field[TASK_COL_VIRTUAL].type = FIELD_UINT_SUFFIX_BIN; 431 field[TASK_COL_VIRTUAL].uint = task->virtmem; 432 field[TASK_COL_PERCENT_VIRTUAL].type = FIELD_PERCENT; 433 field[TASK_COL_PERCENT_VIRTUAL].fixed = perc->virtmem; 434 field[TASK_COL_PERCENT_USER].type = FIELD_PERCENT; 435 field[TASK_COL_PERCENT_USER].fixed = perc->ucycles; 436 field[TASK_COL_PERCENT_KERNEL].type = FIELD_PERCENT; 437 field[TASK_COL_PERCENT_KERNEL].fixed = perc->kcycles; 438 field[TASK_COL_NAME].type = FIELD_STRING; 439 field[TASK_COL_NAME].string = task->name; 440 field += TASK_NUM_COLUMNS; 441 } 442 443 return NULL; 444 } 445 446 static const char *fill_ipc_table(data_t *data) 447 { 448 data->table.name = "IPC"; 449 data->table.num_columns = IPC_NUM_COLUMNS; 450 data->table.columns = ipc_columns; 451 data->table.num_fields = data->tasks_count * IPC_NUM_COLUMNS; 452 data->table.fields = calloc(data->table.num_fields, 453 sizeof(field_t)); 454 if (data->table.fields == NULL) 455 return "Not enough memory for table fields"; 456 457 field_t *field = data->table.fields; 458 for (size_t i = 0; i < data->tasks_count; i++) { 459 field[IPC_COL_TASKID].type = FIELD_UINT; 460 field[IPC_COL_TASKID].uint = data->tasks[i].task_id; 461 field[IPC_COL_CLS_SNT].type = FIELD_UINT_SUFFIX_DEC; 462 field[IPC_COL_CLS_SNT].uint = data->tasks[i].ipc_info.call_sent; 463 field[IPC_COL_CLS_RCV].type = FIELD_UINT_SUFFIX_DEC; 464 field[IPC_COL_CLS_RCV].uint = data->tasks[i].ipc_info.call_received; 465 field[IPC_COL_ANS_SNT].type = FIELD_UINT_SUFFIX_DEC; 466 field[IPC_COL_ANS_SNT].uint = data->tasks[i].ipc_info.answer_sent; 467 field[IPC_COL_ANS_RCV].type = FIELD_UINT_SUFFIX_DEC; 468 field[IPC_COL_ANS_RCV].uint = data->tasks[i].ipc_info.answer_received; 469 field[IPC_COL_FORWARD].type = FIELD_UINT_SUFFIX_DEC; 470 field[IPC_COL_FORWARD].uint = data->tasks[i].ipc_info.forwarded; 471 field[IPC_COL_NAME].type = FIELD_STRING; 472 field[IPC_COL_NAME].string = data->tasks[i].name; 473 field += IPC_NUM_COLUMNS; 474 } 475 476 return NULL; 477 } 478 479 static const char *fill_exception_table(data_t *data) 480 { 481 data->table.name = "Exceptions"; 482 data->table.num_columns = EXCEPTION_NUM_COLUMNS; 483 data->table.columns = exception_columns; 484 data->table.num_fields = data->exceptions_count * 485 EXCEPTION_NUM_COLUMNS; 486 data->table.fields = calloc(data->table.num_fields, sizeof(field_t)); 487 if (data->table.fields == NULL) 488 return "Not enough memory for table fields"; 489 490 field_t *field = data->table.fields; 491 for (size_t i = 0; i < data->exceptions_count; i++) { 492 if (!excs_all && !data->exceptions[i].hot) 493 continue; 494 field[EXCEPTION_COL_ID].type = FIELD_UINT; 495 field[EXCEPTION_COL_ID].uint = data->exceptions[i].id; 496 field[EXCEPTION_COL_COUNT].type = FIELD_UINT_SUFFIX_DEC; 497 field[EXCEPTION_COL_COUNT].uint = data->exceptions[i].count; 498 field[EXCEPTION_COL_PERCENT_COUNT].type = FIELD_PERCENT; 499 field[EXCEPTION_COL_PERCENT_COUNT].fixed = data->exceptions_perc[i].count; 500 field[EXCEPTION_COL_CYCLES].type = FIELD_UINT_SUFFIX_DEC; 501 field[EXCEPTION_COL_CYCLES].uint = data->exceptions[i].cycles; 502 field[EXCEPTION_COL_PERCENT_CYCLES].type = FIELD_PERCENT; 503 field[EXCEPTION_COL_PERCENT_CYCLES].fixed = data->exceptions_perc[i].cycles; 504 field[EXCEPTION_COL_DESCRIPTION].type = FIELD_STRING; 505 field[EXCEPTION_COL_DESCRIPTION].string = data->exceptions[i].desc; 506 field += EXCEPTION_NUM_COLUMNS; 507 } 508 509 /* in case any cold exceptions were ignored */ 510 data->table.num_fields = field - data->table.fields; 511 512 return NULL; 513 } 514 515 static const char *fill_table(data_t *data) 516 { 517 if (data->table.fields != NULL) { 518 free(data->table.fields); 519 data->table.fields = NULL; 520 } 521 522 switch (op_mode) { 523 case OP_TASKS: 524 return fill_task_table(data); 525 case OP_IPC: 526 return fill_ipc_table(data); 527 case OP_EXCS: 528 return fill_exception_table(data); 529 } 530 return NULL; 316 531 } 317 532 … … 356 571 if (target->ecount_diff != NULL) 357 572 free(target->ecount_diff); 573 574 if (target->table.fields != NULL) 575 free(target->table.fields); 358 576 } 359 577 … … 367 585 printf("Reading initial data...\n"); 368 586 369 if ((ret = read_data(&data _prev)) != NULL)587 if ((ret = read_data(&data)) != NULL) 370 588 goto out; 371 589 372 590 /* Compute some rubbish to have initialised values */ 373 compute_percentages(&data _prev, &data_prev);591 compute_percentages(&data, &data); 374 592 375 593 /* And paint screen until death */ 376 594 while (true) { 377 595 int c = tgetchar(UPDATE_INTERVAL); 378 if (c < 0) { 596 597 if (c < 0) { /* timeout */ 598 data_prev = data; 379 599 if ((ret = read_data(&data)) != NULL) { 380 free_data(&data );600 free_data(&data_prev); 381 601 goto out; 382 602 } 383 603 384 604 compute_percentages(&data_prev, &data); 385 sort_data(&data);386 print_data(&data);387 605 free_data(&data_prev); 388 data_prev = data; 389 390 continue; 391 } 392 606 607 c = -1; 608 } 609 610 if (screen_mode == SCREEN_HELP && c >= 0) { 611 if (c == 'h' || c == '?') 612 c = -1; 613 /* go back to table and handle the key */ 614 screen_mode = SCREEN_TABLE; 615 } 616 617 if (screen_mode == SCREEN_SORT && c >= 0) { 618 for (size_t i = 0; i < data.table.num_columns; i++) { 619 if (data.table.columns[i].key == c) { 620 sort_column = i; 621 screen_mode = SCREEN_TABLE; 622 } 623 } 624 625 c = -1; 626 } 627 393 628 switch (c) { 394 case 't': 395 print_warning("Showing task statistics"); 396 op_mode = OP_TASKS; 629 case -1: /* do nothing */ 630 break; 631 case 't': 632 op_mode = OP_TASKS; 633 break; 634 case 'i': 635 op_mode = OP_IPC; 636 break; 637 case 'e': 638 op_mode = OP_EXCS; 639 break; 640 case 's': 641 screen_mode = SCREEN_SORT; 642 break; 643 case 'r': 644 sort_reverse = -sort_reverse; 645 break; 646 case 'h': 647 case '?': 648 screen_mode = SCREEN_HELP; 649 break; 650 case 'q': 651 goto out; 652 case 'a': 653 if (op_mode == OP_EXCS) { 654 excs_all = !excs_all; 655 if (excs_all) 656 show_warning("Showing all exceptions"); 657 else 658 show_warning("Showing only hot exceptions"); 397 659 break; 398 case 'i': 399 print_warning("Showing IPC statistics"); 400 op_mode = OP_IPC; 401 break; 402 case 'e': 403 print_warning("Showing exception statistics"); 404 op_mode = OP_EXCS; 405 break; 406 case 'h': 407 print_warning("Showing help"); 408 op_mode = OP_HELP; 409 break; 410 case 'q': 411 goto out; 412 case 'a': 413 if (op_mode == OP_EXCS) { 414 excs_all = !excs_all; 415 if (excs_all) 416 print_warning("Showing all exceptions"); 417 else 418 print_warning("Showing only hot exceptions"); 419 break; 420 } 421 default: 422 print_warning("Unknown command \"%c\", use \"h\" for help", c); 423 break; 424 } 660 } 661 /* fallthrough */ 662 default: 663 show_warning("Unknown command \"%c\", use \"h\" for help", c); 664 continue; /* don't redraw */ 665 } 666 667 if ((ret = fill_table(&data)) != NULL) { 668 goto out; 669 } 670 sort_table(&data.table); 671 print_data(&data); 425 672 } 426 673 427 674 out: 428 675 screen_done(); 429 free_data(&data _prev);676 free_data(&data); 430 677 431 678 if (ret != NULL) { -
uspace/app/top/top.h
r3d93289a r0c37135 51 51 52 52 typedef enum { 53 OP_TASKS, 54 OP_IPC, 55 OP_EXCS, 56 OP_HELP 57 } op_mode_t; 53 SCREEN_TABLE, 54 SCREEN_SORT, 55 SCREEN_HELP, 56 } screen_mode_t; 58 57 59 typedef enum { 60 SORT_TASK_CYCLES 61 } sort_mode_t; 62 63 extern op_mode_t op_mode; 64 extern sort_mode_t sort_mode; 65 extern bool excs_all; 58 extern screen_mode_t screen_mode; 66 59 67 60 typedef struct { … … 87 80 } perc_exc_t; 88 81 82 typedef enum { 83 FIELD_EMPTY, FIELD_UINT, FIELD_UINT_SUFFIX_BIN, FIELD_UINT_SUFFIX_DEC, 84 FIELD_PERCENT, FIELD_STRING 85 } field_type_t; 86 87 typedef struct { 88 field_type_t type; 89 union { 90 fixed_float fixed; 91 uint64_t uint; 92 const char *string; 93 }; 94 } field_t; 95 96 typedef struct { 97 const char *name; 98 char key; 99 int width; 100 } column_t; 101 102 typedef struct { 103 const char *name; 104 size_t num_columns; 105 const column_t *columns; 106 size_t num_fields; 107 field_t *fields; 108 } table_t; 109 89 110 typedef struct { 90 111 time_t hours; … … 107 128 stats_task_t *tasks; 108 129 perc_task_t *tasks_perc; 109 size_t *tasks_map;110 130 111 131 size_t threads_count; … … 122 142 uint64_t *ecycles_diff; 123 143 uint64_t *ecount_diff; 144 145 table_t table; 124 146 } data_t; 125 147 -
uspace/drv/nic/e1k/Makefile
r3d93289a r0c37135 28 28 29 29 USPACE_PREFIX = ../../.. 30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBN ET_PREFIX)/libnet.a $(LIBNIC_PREFIX)/libnic.a31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBN ET_PREFIX)/include -I$(LIBNIC_PREFIX)/include30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a 31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include 32 32 BINARY = e1k 33 33 -
uspace/drv/nic/e1k/e1k.c
r3d93289a r0c37135 49 49 #include <device/pci.h> 50 50 #include <nic.h> 51 #include <nil_remote.h>52 51 #include <ops/nic.h> 53 52 #include "e1k.h" -
uspace/drv/nic/lo/Makefile
r3d93289a r0c37135 28 28 29 29 USPACE_PREFIX = ../../.. 30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBN ET_PREFIX)/libnet.a $(LIBNIC_PREFIX)/libnic.a31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBN ET_PREFIX)/include -I$(LIBNIC_PREFIX)/include30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a 31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include 32 32 BINARY = lo 33 33 -
uspace/drv/nic/ne2k/Makefile
r3d93289a r0c37135 28 28 29 29 USPACE_PREFIX = ../../.. 30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBN ET_PREFIX)/libnet.a $(LIBNIC_PREFIX)/libnic.a31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBN ET_PREFIX)/include -I$(LIBNIC_PREFIX)/include30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a 31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include 32 32 BINARY = ne2k 33 33 -
uspace/drv/nic/rtl8139/Makefile
r3d93289a r0c37135 28 28 29 29 USPACE_PREFIX = ../../.. 30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBN ET_PREFIX)/libnet.a $(LIBNIC_PREFIX)/libnic.a31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBN ET_PREFIX)/include -I$(LIBNIC_PREFIX)/include30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a 31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include 32 32 BINARY = rtl8139 33 33 -
uspace/drv/nic/rtl8139/driver.c
r3d93289a r0c37135 44 44 #include <sysinfo.h> 45 45 #include <ipc/ns.h> 46 47 #include <net_checksum.h>48 46 49 47 #include <str.h> -
uspace/lib/c/Makefile
r3d93289a r0c37135 87 87 generic/task.c \ 88 88 generic/futex.c \ 89 generic/inet.c \ 90 generic/inetcfg.c \ 91 generic/inetping.c \ 89 92 generic/io/asprintf.c \ 90 93 generic/io/io.c \ … … 97 100 generic/io/printf_core.c \ 98 101 generic/io/console.c \ 102 generic/iplink.c \ 103 generic/iplink_srv.c \ 99 104 generic/malloc.c \ 100 105 generic/sysinfo.c \ … … 108 113 generic/adt/hash_set.c \ 109 114 generic/adt/dynamic_fifo.c \ 110 generic/adt/measured_strings.c \111 115 generic/adt/char_map.c \ 112 116 generic/adt/prodcons.c \ … … 118 122 generic/vfs/canonify.c \ 119 123 generic/net/inet.c \ 120 generic/net/icmp_common.c \121 generic/net/icmp_api.c \122 124 generic/net/modules.c \ 123 generic/net/packet.c \124 125 generic/net/socket_client.c \ 125 126 generic/net/socket_parse.c \ -
uspace/lib/c/generic/io/printf_core.c
r3d93289a r0c37135 283 283 /* Print leading spaces. */ 284 284 size_t strw = str_length(str); 285 if ( precision == 0)285 if ((precision == 0) || (precision > strw)) 286 286 precision = strw; 287 287 … … 331 331 /* Print leading spaces. */ 332 332 size_t strw = wstr_length(str); 333 if ( precision == 0)333 if ((precision == 0) || (precision > strw)) 334 334 precision = strw; 335 335 -
uspace/lib/c/include/ipc/services.h
r3d93289a r0c37135 48 48 SERVICE_IRC = FOURCC('i', 'r', 'c', ' '), 49 49 SERVICE_CLIPBOARD = FOURCC('c', 'l', 'i', 'p'), 50 SERVICE_NETWORKING = FOURCC('n', 'e', 't', ' '),51 SERVICE_ETHERNET = FOURCC('e', 't', 'h', ' '),52 SERVICE_NILDUMMY = FOURCC('n', 'i', 'l', 'd'),53 SERVICE_IP = FOURCC('i', 'p', 'v', '4'),54 SERVICE_ARP = FOURCC('a', 'r', 'p', ' '),55 SERVICE_ICMP = FOURCC('i', 'c', 'm', 'p'),56 50 SERVICE_UDP = FOURCC('u', 'd', 'p', ' '), 57 51 SERVICE_TCP = FOURCC('t', 'c', 'p', ' ') 58 52 } services_t; 53 54 #define SERVICE_NAME_INET "net/inet" 55 #define SERVICE_NAME_INETCFG "net/inetcfg" 56 #define SERVICE_NAME_INETPING "net/inetping" 59 57 60 58 #endif -
uspace/lib/c/include/ipc/socket.h
r3d93289a r0c37135 38 38 #define LIBC_SOCKET_MESSAGES_H_ 39 39 40 #include <ipc/net.h>41 42 40 /** Socket client messages. */ 43 41 typedef enum { 44 42 /** Creates a new socket. @see socket() */ 45 NET_SOCKET = NET_SOCKET_FIRST,43 NET_SOCKET = IPC_FIRST_USER_METHOD, 46 44 /** Binds the socket. @see bind() */ 47 45 NET_SOCKET_BIND, -
uspace/lib/c/include/net/in.h
r3d93289a r0c37135 45 45 #define INET_ADDRSTRLEN (4 * 3 + 3 + 1) 46 46 47 #define INADDR_ANY 0 48 47 49 /** Type definition of the INET address. 48 50 * @see in_addr -
uspace/lib/net/Makefile
r3d93289a r0c37135 33 33 34 34 SOURCES = \ 35 generic/generic.c \ 36 generic/net_remote.c \ 37 generic/net_checksum.c \ 38 generic/packet_client.c \ 39 generic/packet_remote.c \ 40 generic/protocol_map.c \ 41 adt/module_map.c \ 42 nil/nil_remote.c \ 43 nil/nil_skel.c \ 44 il/il_remote.c \ 45 il/il_skel.c \ 46 il/ip_remote.c \ 47 il/ip_client.c \ 48 il/arp_remote.c \ 49 tl/icmp_remote.c \ 50 tl/icmp_client.c \ 51 tl/socket_core.c \ 52 tl/tl_common.c \ 53 tl/tl_remote.c \ 54 tl/tl_skel.c 35 tl/socket_core.c 55 36 56 37 include $(USPACE_PREFIX)/Makefile.common -
uspace/lib/net/include/socket_core.h
r3d93289a r0c37135 44 44 #include <net/in.h> 45 45 #include <net/device.h> 46 #include <net/packet.h>47 46 #include <async.h> 48 47 … … 80 79 /** Bound port. */ 81 80 int port; 82 /** Received packets queue. */83 dyn_fifo_t received;84 81 /** Sockets for acceptance queue. */ 85 82 dyn_fifo_t accepted; … … 118 115 extern int socket_destroy(async_sess_t *, int, socket_cores_t *, 119 116 socket_ports_t *, void (*)(socket_core_t *)); 120 extern int socket_reply_packets(packet_t *, size_t *);121 117 extern socket_core_t *socket_port_find(socket_ports_t *, int, const uint8_t *, 122 118 size_t); -
uspace/lib/net/tl/socket_core.c
r3d93289a r0c37135 36 36 37 37 #include <socket_core.h> 38 #include <packet_client.h>39 #include <packet_remote.h>40 38 #include <net/socket_codes.h> 41 39 #include <net/in.h> 42 40 #include <net/inet.h> 43 #include <net/packet.h>44 41 #include <net/modules.h> 45 42 #include <stdint.h> … … 92 89 } 93 90 94 /* Release all received packets */95 int packet_id;96 while ((packet_id = dyn_fifo_pop(&socket->received)) >= 0)97 pq_release_remote(sess, packet_id);98 99 dyn_fifo_destroy(&socket->received);100 91 dyn_fifo_destroy(&socket->accepted); 101 92 … … 448 439 socket->key_length = 0; 449 440 socket->specific_data = specific_data; 450 rc = dyn_fifo_initialize(&socket->received, SOCKET_INITIAL_RECEIVED_SIZE); 441 442 rc = dyn_fifo_initialize(&socket->accepted, SOCKET_INITIAL_ACCEPTED_SIZE); 451 443 if (rc != EOK) { 452 444 free(socket); 453 445 return rc; 454 446 } 455 456 rc = dyn_fifo_initialize(&socket->accepted, SOCKET_INITIAL_ACCEPTED_SIZE);457 if (rc != EOK) {458 dyn_fifo_destroy(&socket->received);459 free(socket);460 return rc;461 }462 447 socket->socket_id = *socket_id; 463 448 rc = socket_cores_add(local_sockets, socket->socket_id, socket); 464 449 if (rc < 0) { 465 dyn_fifo_destroy(&socket->received);466 450 dyn_fifo_destroy(&socket->accepted); 467 451 free(socket); … … 506 490 socket_destroy_core(sess, socket, local_sockets, global_sockets, 507 491 socket_release); 508 509 return EOK;510 }511 512 /** Replies the packet or the packet queue data to the application via the513 * socket.514 *515 * Uses the current message processing fibril.516 *517 * @param[in] packet The packet to be transfered.518 * @param[out] length The total data length.519 * @return EOK on success.520 * @return EBADMEM if the length parameter is NULL.521 * @return ENOMEM if there is not enough memory left.522 * @return Other error codes as defined for the data_reply()523 * function.524 */525 int socket_reply_packets(packet_t *packet, size_t *length)526 {527 packet_t *next_packet;528 size_t fragments;529 size_t *lengths;530 size_t index;531 int rc;532 533 if (!length)534 return EBADMEM;535 536 next_packet = pq_next(packet);537 if (!next_packet) {538 /* Write all if only one fragment */539 rc = data_reply(packet_get_data(packet),540 packet_get_data_length(packet));541 if (rc != EOK)542 return rc;543 /* Store the total length */544 *length = packet_get_data_length(packet);545 } else {546 /* Count the packet fragments */547 fragments = 1;548 next_packet = pq_next(packet);549 while ((next_packet = pq_next(next_packet)))550 ++fragments;551 552 /* Compute and store the fragment lengths */553 lengths = (size_t *) malloc(sizeof(size_t) * fragments +554 sizeof(size_t));555 if (!lengths)556 return ENOMEM;557 558 lengths[0] = packet_get_data_length(packet);559 lengths[fragments] = lengths[0];560 next_packet = pq_next(packet);561 562 for (index = 1; index < fragments; ++index) {563 lengths[index] = packet_get_data_length(next_packet);564 lengths[fragments] += lengths[index];565 next_packet = pq_next(packet);566 }567 568 /* Write the fragment lengths */569 rc = data_reply(lengths, sizeof(int) * (fragments + 1));570 if (rc != EOK) {571 free(lengths);572 return rc;573 }574 next_packet = packet;575 576 /* Write the fragments */577 for (index = 0; index < fragments; ++index) {578 rc = data_reply(packet_get_data(next_packet),579 lengths[index]);580 if (rc != EOK) {581 free(lengths);582 return rc;583 }584 next_packet = pq_next(next_packet);585 }586 587 /* Store the total length */588 *length = lengths[fragments];589 free(lengths);590 }591 492 592 493 return EOK; -
uspace/srv/loc/loc.c
r3d93289a r0c37135 1296 1296 categ_dir_add_cat(&cdir, cat); 1297 1297 1298 cat = category_new("iplink"); 1299 categ_dir_add_cat(&cdir, cat); 1300 1298 1301 cat = category_new("keyboard"); 1299 1302 categ_dir_add_cat(&cdir, cat);
Note:
See TracChangeset
for help on using the changeset viewer.