ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.158 by root, Wed Jan 10 19:52:43 2007 UTC vs.
Revision 1.161 by root, Thu Jan 11 00:16:58 2007 UTC

… …
33 33
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 35
36our %COMMAND = (); 36our %COMMAND = ();
37our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
38our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
39 43
40our @EVENT; 44our @EVENT;
41our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
42 46
43our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
… …
52 56
53our %PLAYER; # all users 57our %PLAYER; # all users
54our %MAP; # all maps 58our %MAP; # all maps
55our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map
56our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
57our %EXT_CORO; # coroutines bound to extensions
58 61
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
61 64
62binmode STDOUT; 65binmode STDOUT;
… …
156} 159}
157 160
158$Event::DIED = sub { 161$Event::DIED = sub {
159 warn "error in event callback: @_"; 162 warn "error in event callback: @_";
160}; 163};
161
162my %ext_pkg;
163my @exts;
164my @hook;
165 164
166=head2 UTILITY FUNCTIONS 165=head2 UTILITY FUNCTIONS
167 166
168=over 4 167=over 4
169 168
… …
319 } 318 }
320} 319}
321 320
322=item $coro = cf::async_ext { BLOCK } 321=item $coro = cf::async_ext { BLOCK }
323 322
324Like async, but this coro is automcatially being canceled when the 323Like async, but this coro is automatically being canceled when the
325extension calling this is being unloaded. 324extension calling this is being unloaded.
326 325
327=cut 326=cut
328 327
329sub async_ext(&) { 328sub async_ext(&) {
… …
373 '""' => \&as_string; 372 '""' => \&as_string;
374 373
375# used to convert map paths into valid unix filenames by repalcing / by ∕ 374# used to convert map paths into valid unix filenames by repalcing / by ∕
376our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 375our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
377 376
377sub register {
378 my ($pkg, $prefix) = @_;
379
380 $EXT_MAP{$prefix} = $pkg;
381}
382
378sub new { 383sub new {
379 my ($class, $path, $base) = @_; 384 my ($class, $path, $base) = @_;
380 385
381 $path = $path->as_string if ref $path; 386 return $path if ref $path;
382 387
383 my $self = bless { }, $class; 388 my $self = {};
384 389
385 # {... are special paths that are not touched 390 # {... are special paths that are not being touched
386 # ?xxx/... are special absolute paths 391 # ?xxx/... are special absolute paths
387 # ?random/... random maps 392 # ?random/... random maps
388 # /! non-realised random map exit 393 # /! non-realised random map exit
389 # /... normal maps 394 # /... normal maps
390 # ~/... per-player maps without a specific player (DO NOT USE) 395 # ~/... per-player maps without a specific player (DO NOT USE)
… …
392 397
393 $path =~ s/$PATH_SEP/\//go; 398 $path =~ s/$PATH_SEP/\//go;
394 399
395 if ($path =~ /^{/) { 400 if ($path =~ /^{/) {
396 # fine as it is 401 # fine as it is
397 } elsif ($path =~ s{^\?random/}{}) {
398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
399 $self->{random} = cf::from_json $data;
400 } else { 402 } else {
401 if ($path =~ s{^~([^/]+)?}{}) { 403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
402 $self->{user_rel} = 1; 405 $self->{user_rel} = 1;
403 406
404 if (defined $1) { 407 if (defined $1) {
405 $self->{user} = $1; 408 $self->{user} = $1;
406 } elsif ($base =~ m{^~([^/]+)/}) { 409 } elsif ($base =~ m{^~([^/]+)/}) {
407 $self->{user} = $1; 410 $self->{user} = $1;
408 } else { 411 } else {
409 warn "cannot resolve user-relative path without user <$path,$base>\n"; 412 warn "cannot resolve user-relative path without user <$path,$base>\n";
410 } 413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
411 } elsif ($path =~ /^\//) { 420 } elsif ($path =~ /^\//) {
421 # /...
412 # already absolute 422 # already absolute
413 } else { 423 } else {
424 # relative
414 $base =~ s{[^/]+/?$}{}; 425 $base =~ s{[^/]+/?$}{};
415 return $class->new ("$base/$path"); 426 return $class->new ("$base/$path");
416 } 427 }
417 428
418 for ($path) { 429 for ($path) {
… …
421 } 432 }
422 } 433 }
423 434
424 $self->{path} = $path; 435 $self->{path} = $path;
425 436
437 if ("HASH" eq ref $self) {
438 bless $self, $class;
439 } else {
440 $self->init;
441 }
442
443 for my $ext (values %EXT_MAP) {
444 if (my $subst = $ext->substitute ($self)) {
445 return $subst;
446 }
447 }
448
426 $self 449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
427} 458}
428 459
429# the name / primary key / in-game path 460# the name / primary key / in-game path
430sub as_string { 461sub as_string {
431 my ($self) = @_; 462 my ($self) = @_;
432 463
433 $self->{user_rel} ? "~$self->{user}$self->{path}" 464 $self->{user_rel} ? "~$self->{user}$self->{path}"
434 : $self->{random} ? "?random/$self->{path}" 465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
435 : $self->{path} 466 : $self->{path}
436} 467}
437 468
438# the displayed name, this is a one way mapping 469# the displayed name, this is a one way mapping
439sub visible_name { 470sub visible_name {
440 my ($self) = @_; 471 &as_string
441
442# if (my $rmp = $self->{random}) {
443# # todo: be more intelligent about this
444# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
445# } else {
446 $self->as_string
447# }
448} 472}
449 473
450# escape the /'s in the path 474# escape the /'s in the path
451sub _escaped_path { 475sub _escaped_path {
452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
… …
467 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path 491 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
468 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path} 492 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
469 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 493 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
470} 494}
471 495
472# the unique path, might be eq to save_path 496# the unique path, undef == no special unique path
473sub uniq_path { 497sub uniq_path {
474 my ($self) = @_; 498 my ($self) = @_;
475 499
476 $self->{user_rel} || $self->{random}
477 ? undef
478 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 500 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
479}
480
481# return random map parameters, or undef
482sub random_map_params {
483 my ($self) = @_;
484
485 $self->{random}
486} 501}
487 502
488# this is somewhat ugly, but style maps do need special treatment 503# this is somewhat ugly, but style maps do need special treatment
489sub is_style_map { 504sub is_style_map {
490 $_[0]{path} =~ m{^/styles/} 505 $_[0]{path} =~ m{^/styles/}
506}
507
508sub load_orig {
509 my ($self) = @_;
510
511 &cf::map::load_map_header ($self->load_path)
512}
513
514sub load_temp {
515 my ($self) = @_;
516
517 &cf::map::load_map_header ($self->save_path)
491} 518}
492 519
493package cf; 520package cf;
494 521
495############################################################################# 522#############################################################################
… …
945=cut 972=cut
946 973
947sub register_extcmd { 974sub register_extcmd {
948 my ($name, $cb) = @_; 975 my ($name, $cb) = @_;
949 976
950 my $caller = caller;
951 #warn "registering extcmd '$name' to '$caller'";
952
953 $EXTCMD{$name} = [$cb, $caller]; 977 $EXTCMD{$name} = $cb;
954} 978}
955 979
956cf::player->attach ( 980cf::player->attach (
957 on_command => sub { 981 on_command => sub {
958 my ($pl, $name, $params) = @_; 982 my ($pl, $name, $params) = @_;
… …
971 995
972 my $msg = eval { from_json $buf }; 996 my $msg = eval { from_json $buf };
973 997
974 if (ref $msg) { 998 if (ref $msg) {
975 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 999 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
976 if (my %reply = $cb->[0]->($pl, $msg)) { 1000 if (my %reply = $cb->($pl, $msg)) {
977 $pl->ext_reply ($msg->{msgid}, %reply); 1001 $pl->ext_reply ($msg->{msgid}, %reply);
978 } 1002 }
979 } 1003 }
980 } else { 1004 } else {
981 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1005 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
983 1007
984 cf::override; 1008 cf::override;
985 }, 1009 },
986); 1010);
987 1011
988sub register {
989 my ($base, $pkg) = @_;
990
991 #TODO
992}
993
994sub load_extension { 1012sub load_extension {
995 my ($path) = @_; 1013 my ($path) = @_;
996 1014
997 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1015 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
998 my $base = $1; 1016 my $base = $1;
999 my $pkg = $1; 1017 my $pkg = $1;
1000 $pkg =~ s/[^[:word:]]/_/g; 1018 $pkg =~ s/[^[:word:]]/_/g;
1001 $pkg = "ext::$pkg"; 1019 $pkg = "ext::$pkg";
1002 1020
1003 warn "loading '$path' into '$pkg'\n"; 1021 warn "... loading '$path' into '$pkg'\n";
1004 1022
1005 open my $fh, "<:utf8", $path 1023 open my $fh, "<:utf8", $path
1006 or die "$path: $!"; 1024 or die "$path: $!";
1007 1025
1008 my $source = 1026 my $source =
… …
1013 1031
1014 eval $source 1032 eval $source
1015 or die $@ ? "$path: $@\n" 1033 or die $@ ? "$path: $@\n"
1016 : "extension disabled.\n"; 1034 : "extension disabled.\n";
1017 1035
1018 push @exts, $pkg; 1036 push @EXTS, $pkg;
1019 $ext_pkg{$base} = $pkg;
1020
1021# no strict 'refs';
1022# @{"$pkg\::ISA"} = ext::;
1023
1024 register $base, $pkg;
1025}
1026
1027sub unload_extension {
1028 my ($pkg) = @_;
1029
1030 warn "removing extension $pkg\n";
1031
1032 # remove hooks
1033 #TODO
1034# for my $idx (0 .. $#PLUGIN_EVENT) {
1035# delete $hook[$idx]{$pkg};
1036# }
1037
1038 # remove commands
1039 for my $name (keys %COMMAND) {
1040 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1041
1042 if (@cb) {
1043 $COMMAND{$name} = \@cb;
1044 } else {
1045 delete $COMMAND{$name};
1046 }
1047 }
1048
1049 # remove extcmds
1050 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1051 delete $EXTCMD{$name};
1052 }
1053
1054 if (my $cb = $pkg->can ("unload")) {
1055 eval {
1056 $cb->($pkg);
1057 1
1058 } or warn "$pkg unloaded, but with errors: $@";
1059 }
1060
1061 Symbol::delete_package $pkg;
1062} 1037}
1063 1038
1064sub load_extensions { 1039sub load_extensions {
1065 for my $ext (<$LIBDIR/*.ext>) { 1040 for my $ext (<$LIBDIR/*.ext>) {
1066 next unless -r $ext; 1041 next unless -r $ext;
… …
1314 1289
1315 $_->change_map_light ($change) 1290 $_->change_map_light ($change)
1316 for grep $_->outdoor, values %cf::MAP; 1291 for grep $_->outdoor, values %cf::MAP;
1317} 1292}
1318 1293
1319sub try_load_header($) { 1294sub load_map_header($) {
1320 my ($path) = @_; 1295 my ($path) = @_;
1321 1296
1322 utf8::encode $path; 1297 utf8::encode $path;
1323 aio_open $path, O_RDONLY, 0 1298 aio_open $path, O_RDONLY, 0
1324 or return; 1299 or return;
1325 1300
1326 my $map = cf::map::new 1301 my $map = cf::map::new
1327 or return; 1302 or return;
1328 1303
1329 # for better error messages only, will be overwritten 1304 # for better error messages only, will be overwritten later
1330 $map->path ($path); 1305 $map->path ($path);
1331 1306
1332 $map->load_header ($path) 1307 $map->load_header ($path)
1333 or return; 1308 or return;
1334 1309
… …
1350 1325
1351 $cf::MAP{$key} || do { 1326 $cf::MAP{$key} || do {
1352 my $guard = cf::lock_acquire "map_find:$key"; 1327 my $guard = cf::lock_acquire "map_find:$key";
1353 1328
1354 # do it the slow way 1329 # do it the slow way
1355 my $map = try_load_header $path->save_path; 1330 my $map = $path->load_temp;
1356 1331
1357 Coro::cede; 1332 Coro::cede;
1358 1333
1359 if ($map) { 1334 if ($map) {
1360 $map->last_access ((delete $map->{last_access}) 1335 $map->last_access ((delete $map->{last_access})
1361 || $cf::RUNTIME); #d# 1336 || $cf::RUNTIME); #d#
1362 # safety 1337 # safety
1363 $map->{instantiate_time} = $cf::RUNTIME 1338 $map->{instantiate_time} = $cf::RUNTIME
1364 if $map->{instantiate_time} > $cf::RUNTIME; 1339 if $map->{instantiate_time} > $cf::RUNTIME;
1365 } else { 1340 } else {
1366 if (my $rmp = $path->random_map_params) { 1341 $map = $path->load_orig
1367 $map = generate_random_map $key, $rmp;
1368 } else {
1369 $map = try_load_header $path->load_path;
1370 }
1371
1372 $map or return; 1342 or return;
1373 1343
1374 $map->{load_original} = 1; 1344 $map->{load_original} = 1;
1375 $map->{instantiate_time} = $cf::RUNTIME; 1345 $map->{instantiate_time} = $cf::RUNTIME;
1376 $map->last_access ($cf::RUNTIME); 1346 $map->last_access ($cf::RUNTIME);
1377 $map->instantiate; 1347 $map->instantiate;
… …
2340 return; 2310 return;
2341 } 2311 }
2342 2312
2343 warn "reloading..."; 2313 warn "reloading...";
2344 2314
2315 warn "freezing server";
2345 my $guard = freeze_mainloop; 2316 my $guard = freeze_mainloop;
2346 cf::emergency_save; 2317 cf::emergency_save;
2347 2318
2319 warn "sync database to disk";
2320 cf::db_sync;
2321 IO::AIO::flush;
2322
2348 eval { 2323 eval {
2349 # if anything goes wrong in here, we should simply crash as we already saved 2324 # if anything goes wrong in here, we should simply crash as we already saved
2350 2325
2351 # cancel all watchers 2326 warn "cancel all watchers";
2352 for (Event::all_watchers) { 2327 for (Event::all_watchers) {
2353 $_->cancel if $_->data & WF_AUTOCANCEL; 2328 $_->cancel if $_->data & WF_AUTOCANCEL;
2354 } 2329 }
2355 2330
2356 # cancel all extension coros 2331 warn "cancel all extension coros";
2357 $_->cancel for values %EXT_CORO; 2332 $_->cancel for values %EXT_CORO;
2358 %EXT_CORO = (); 2333 %EXT_CORO = ();
2359 2334
2335 warn "remove commands";
2336 %COMMAND = ();
2337
2338 warn "remove ext commands";
2339 %EXTCMD = ();
2340
2360 # unload all extensions 2341 warn "unload/nuke all extensions";
2361 for (@exts) { 2342 for my $pkg (@EXTS) {
2362 warn "unloading <$_>"; 2343 warn "... unloading $pkg";
2363 unload_extension $_; 2344
2345 if (my $cb = $pkg->can ("unload")) {
2346 eval {
2347 $cb->($pkg);
2348 1
2349 } or warn "$pkg unloaded, but with errors: $@";
2364 } 2350 }
2365 2351
2352 warn "... nuking $pkg";
2353 Symbol::delete_package $pkg;
2354 }
2355
2366 # unload all modules loaded from $LIBDIR 2356 warn "unload all perl modules loaded from $LIBDIR";
2367 while (my ($k, $v) = each %INC) { 2357 while (my ($k, $v) = each %INC) {
2368 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2369 2359
2370 warn "removing <$k>"; 2360 warn "removing <$k>";
2371 delete $INC{$k}; 2361 delete $INC{$k};
… …
2378 } 2368 }
2379 2369
2380 Symbol::delete_package $k; 2370 Symbol::delete_package $k;
2381 } 2371 }
2382 2372
2383 # sync database to disk
2384 cf::db_sync;
2385 IO::AIO::flush;
2386
2387 # get rid of safe::, as good as possible 2373 warn "get rid of safe::, as good as possible";
2388 Symbol::delete_package "safe::$_" 2374 Symbol::delete_package "safe::$_"
2389 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2375 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2390 2376
2391 # remove register_script_function callbacks
2392 # TODO
2393
2394 # unload cf.pm "a bit" 2377 warn "unload cf.pm \"a bit\"";
2395 delete $INC{"cf.pm"}; 2378 delete $INC{"cf.pm"};
2396 2379
2397 # don't, removes xs symbols, too, 2380 # don't, removes xs symbols, too,
2398 # and global variables created in xs 2381 # and global variables created in xs
2399 #Symbol::delete_package __PACKAGE__; 2382 #Symbol::delete_package __PACKAGE__;
2400 2383
2401 # reload cf.pm
2402 warn "reloading cf.pm"; 2384 warn "reloading cf.pm";
2403 require cf; 2385 require cf;
2404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2386 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2405 2387
2406 # load config and database again 2388 warn "load config and database again";
2407 cf::cfg_load; 2389 cf::cfg_load;
2408 cf::db_load; 2390 cf::db_load;
2409 2391
2410 # load extensions
2411 warn "load extensions"; 2392 warn "load extensions";
2412 cf::load_extensions; 2393 cf::load_extensions;
2413 2394
2414 # reattach attachments to objects 2395 warn "reattach attachments to objects/players";
2415 warn "reattach";
2416 _global_reattach; 2396 _global_reattach;
2397 warn "reattach attachments to maps";
2417 reattach $_ for values %MAP; 2398 reattach $_ for values %MAP;
2418 }; 2399 };
2419 2400
2420 if ($@) { 2401 if ($@) {
2421 warn $@; 2402 warn $@;
2422 warn "error while reloading, exiting."; 2403 warn "error while reloading, exiting.";
2423 exit 1; 2404 exit 1;
2424 } 2405 }
2425 2406
2426 warn "reloaded successfully"; 2407 warn "reloaded";
2427}; 2408};
2428 2409
2429############################################################################# 2410#############################################################################
2430 2411
2431unless ($LINK_MAP) { 2412unless ($LINK_MAP) {
… …
2466 $LINK_MAP->{deny_save} = 1; 2447 $LINK_MAP->{deny_save} = 1;
2467 $LINK_MAP->{deny_reset} = 1; 2448 $LINK_MAP->{deny_reset} = 1;
2468 2449
2469 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2450 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2470} 2451}
2471
2472register "<global>", __PACKAGE__;
2473 2452
2474register_command "reload" => sub { 2453register_command "reload" => sub {
2475 my ($who, $arg) = @_; 2454 my ($who, $arg) = @_;
2476 2455
2477 if ($who->flag (FLAG_WIZ)) { 2456 if ($who->flag (FLAG_WIZ)) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines