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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.356 by root, Tue Sep 4 05:43:21 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
… …
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 88our $DB_ENV;
86 89
87our %CFG; 90our %CFG;
88 91
89our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
… …
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
196 198
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
285Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
286 288
287=cut 289=cut
288 290
289our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
290 293
291sub lock_wait($) { 294sub lock_wait($) {
292 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
293 301
294 # wait for lock, if any 302 # wait for lock, if any
295 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 305 Coro::schedule;
… …
303 311
304 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
305 lock_wait $key; 313 lock_wait $key;
306 314
307 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
308 317
309 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
312 } 322 }
313} 323}
314 324
… …
344our @SLOT_QUEUE; 354our @SLOT_QUEUE;
345our $SLOT_QUEUE; 355our $SLOT_QUEUE;
346 356
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
349 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
350 362
351 while () { 363 while () {
352 next_job: 364 next_job:
353 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
361 } 373 }
362 } 374 }
363 } 375 }
364 376
365 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 380 $signal->wait;
369 } else { 381 } else {
370 Coro::schedule; 382 Coro::schedule;
371 } 383 }
… …
415 my $time = Event::time; 427 my $time = Event::time;
416 428
417 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
419 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
420 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
421 # (but this is cancel-safe) 435 # (but this is cancel-safe)
422 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
423 437
424 my $busy = 1; 438 my $busy = 1;
425 my @res; 439 my @res;
426 440
427 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 443 @res = eval { $job->() };
429 warn $@ if $@; 444 warn $@ if $@;
430 undef $busy; 445 undef $busy;
431 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
432 447
433 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
434 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
435 } 454 }
436 455
437 $time = Event::time - $time; 456 $time = Event::time - $time;
438 457
439 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
500=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
501 520
502Stores the given C<$value> in the family. It can currently store binary 521Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
505=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
506 547
507our $DB; 548our $DB;
508 549
509sub db_init { 550sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 551 cf::sync_job {
514 eval { 552 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 553 };
524} 554}
525 555
526sub db_get($$) { 556sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
528 558
… …
940 970
941=cut 971=cut
942 972
943############################################################################# 973#############################################################################
944# object support 974# object support
945#
946 975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
947sub _can_merge { 1009sub _can_merge {
948 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
949 1011
950 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1013
954 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
955} 1016}
956 1017
957sub reattach { 1018sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1005); 1066);
1006 1067
1007sub object_freezer_save { 1068sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1009 1070
1010 my $guard = cf::lock_acquire "io";
1011
1012 sync_job { 1071 sync_job {
1013 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1016 1076
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1021 close $fh; 1081 close $fh;
1022 1082
1023 if (@$objs) { 1083 if (@$objs) {
1024 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1025 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1026 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1027 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1089 close $fh;
1030 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1031 } 1091 }
… …
1040 } else { 1100 } else {
1041 aio_unlink $filename; 1101 aio_unlink $filename;
1042 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1043 } 1103 }
1044 }; 1104 };
1045
1046 undef $guard;
1047} 1105}
1048 1106
1049sub object_freezer_as_string { 1107sub object_freezer_as_string {
1050 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1051 1109
… …
1056 1114
1057sub object_thawer_load { 1115sub object_thawer_load {
1058 my ($filename) = @_; 1116 my ($filename) = @_;
1059 1117
1060 my ($data, $av); 1118 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1063 1119
1064 (aio_load $filename, $data) >= 0 1120 (aio_load $filename, $data) >= 0
1065 or return; 1121 or return;
1066 1122
1067 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1068 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1069 or return; 1125 or return;
1070 1126
1071 undef $guard; 1127 my $st = eval { Coro::Storable::thaw $av }
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs};
1073 } 1130 }
1074 1131
1132 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1133 warn sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1134 $decname, length $data, scalar @{$av || []};
1077 1135
1078 ($data, $av) 1136 ($data, $av)
1079} 1137}
1080 1138
1081=head2 COMMAND CALLBACKS 1139=head2 COMMAND CALLBACKS
… …
1269 1327
1270=head3 cf::player 1328=head3 cf::player
1271 1329
1272=over 4 1330=over 4
1273 1331
1332=item cf::player::num_playing
1333
1334Returns the official number of playing players, as per the Crossfire metaserver rules.
1335
1336=cut
1337
1338sub num_playing {
1339 scalar grep
1340 $_->ob->map
1341 && !$_->hidden
1342 && !$_->ob->flag (cf::FLAG_WIZ),
1343 cf::player::list
1344}
1345
1274=item cf::player::find $login 1346=item cf::player::find $login
1275 1347
1276Returns the given player object, loading it if necessary (might block). 1348Returns the given player object, loading it if necessary (might block).
1277 1349
1278=cut 1350=cut
… …
1316 aio_unlink +(playerdir $login) . "/$login.pl"; 1388 aio_unlink +(playerdir $login) . "/$login.pl";
1317 1389
1318 my $f = new_from_file cf::object::thawer path $login 1390 my $f = new_from_file cf::object::thawer path $login
1319 or return; 1391 or return;
1320 1392
1321 $f->next;
1322 my $pl = cf::player::load_pl $f 1393 my $pl = cf::player::load_pl $f
1323 or return; 1394 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl; 1395 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs; 1396 $f->resolve_delayed_derefs;
1326 $cf::PLAYER{$login} = $pl 1397 $cf::PLAYER{$login} = $pl
… …
1841sub find { 1912sub find {
1842 my ($path, $origin) = @_; 1913 my ($path, $origin) = @_;
1843 1914
1844 $path = normalise $path, $origin && $origin->path; 1915 $path = normalise $path, $origin && $origin->path;
1845 1916
1917 cf::lock_wait "map_data:$path";#d#remove
1846 cf::lock_wait "map_find:$path"; 1918 cf::lock_wait "map_find:$path";
1847 1919
1848 $cf::MAP{$path} || do { 1920 $cf::MAP{$path} || do {
1849 my $guard = cf::lock_acquire "map_find:$path"; 1921 my $guard1 = cf::lock_acquire "map_find:$path";
1922 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1923
1850 my $map = new_from_path cf::map $path 1924 my $map = new_from_path cf::map $path
1851 or return; 1925 or return;
1852 1926
1853 $map->{last_save} = $cf::RUNTIME; 1927 $map->{last_save} = $cf::RUNTIME;
1854 1928
… …
1856 or return; 1930 or return;
1857 1931
1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously 1933 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait; 1934 #$cf::WAIT_FOR_TICK->wait;
1935 undef $guard1;
1936 undef $guard2;
1861 $map->reset; 1937 $map->reset;
1862 undef $guard;
1863 return find $path; 1938 return find $path;
1864 } 1939 }
1865 1940
1866 $cf::MAP{$path} = $map 1941 $cf::MAP{$path} = $map
1867 } 1942 }
… …
1876 local $self->{deny_reset} = 1; # loading can take a long time 1951 local $self->{deny_reset} = 1; # loading can take a long time
1877 1952
1878 my $path = $self->{path}; 1953 my $path = $self->{path};
1879 1954
1880 { 1955 {
1881 my $guard1 = cf::lock_acquire "map_data:$path"; 1956 my $guard = cf::lock_acquire "map_data:$path";
1882 my $guard2 = cf::lock_acquire "map_load:$path";
1883 1957
1958 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 1959 return unless $self->in_memory == cf::MAP_SWAPPED;
1885 1960
1886 $self->in_memory (cf::MAP_LOADING); 1961 $self->in_memory (cf::MAP_LOADING);
1887 1962
1888 $self->alloc; 1963 $self->alloc;
1889 1964
… …
2003 } 2078 }
2004 2079
2005 $MAP_PREFETCH{$path} |= $load; 2080 $MAP_PREFETCH{$path} |= $load;
2006 2081
2007 $MAP_PREFETCHER ||= cf::async { 2082 $MAP_PREFETCHER ||= cf::async {
2083 $Coro::current->{desc} = "map prefetcher";
2084
2008 while (%MAP_PREFETCH) { 2085 while (%MAP_PREFETCH) {
2009 while (my ($k, $v) = each %MAP_PREFETCH) { 2086 while (my ($k, $v) = each %MAP_PREFETCH) {
2010 if (my $map = find $k) { 2087 if (my $map = find $k) {
2011 $map->load if $v; 2088 $map->load if $v;
2012 } 2089 }
… …
2038 return if $self->{deny_save}; 2115 return if $self->{deny_save};
2039 2116
2040 local $self->{last_access} = $self->last_access;#d# 2117 local $self->{last_access} = $self->last_access;#d#
2041 2118
2042 cf::async { 2119 cf::async {
2120 $Coro::current->{desc} = "map player save";
2043 $_->contr->save for $self->players; 2121 $_->contr->save for $self->players;
2044 }; 2122 };
2045 2123
2046 if ($uniq) { 2124 if ($uniq) {
2047 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2061 2139
2062 return if $self->players; 2140 return if $self->players;
2063 return if $self->in_memory != cf::MAP_IN_MEMORY; 2141 return if $self->in_memory != cf::MAP_IN_MEMORY;
2064 return if $self->{deny_save}; 2142 return if $self->{deny_save};
2065 2143
2144 $self->in_memory (cf::MAP_SWAPPED);
2145
2146 $self->deactivate;
2147 $_->clear_links_to ($self) for values %cf::MAP;
2066 $self->clear; 2148 $self->clear;
2067 $self->in_memory (cf::MAP_SWAPPED);
2068} 2149}
2069 2150
2070sub reset_at { 2151sub reset_at {
2071 my ($self) = @_; 2152 my ($self) = @_;
2072 2153
… …
2104 if $uniq; 2185 if $uniq;
2105 } 2186 }
2106 2187
2107 delete $cf::MAP{$self->path}; 2188 delete $cf::MAP{$self->path};
2108 2189
2190 $self->deactivate;
2191 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2192 $self->clear;
2110
2111 $_->clear_links_to ($self) for values %cf::MAP;
2112 2193
2113 $self->unlink_save; 2194 $self->unlink_save;
2114 $self->destroy; 2195 $self->destroy;
2115} 2196}
2116 2197
… …
2231=cut 2312=cut
2232 2313
2233sub deref { 2314sub deref {
2234 my ($ref) = @_; 2315 my ($ref) = @_;
2235 2316
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2317 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2); 2318 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2319 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return; 2320 or return;
2243 $pl->ob->uuid eq $uuid 2321 $pl->ob->uuid eq $uuid
2244 or return; 2322 or return;
… …
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416 2494
2417 $self->enter_link; 2495 $self->enter_link;
2418 2496
2419 (async { 2497 (async {
2498 $Coro::current->{desc} = "player::goto $path $x $y";
2499
2500 # *tag paths override both path and x|y
2501 if ($path =~ /^\*(.*)$/) {
2502 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2503 my $ob = $obs[rand @obs];
2504
2505 # see if we actually can go there
2506 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2507 $ob = $obs[rand @obs];
2508 } else {
2509 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2510 }
2511 # else put us there anyways for now #d#
2512
2513 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2514 } else {
2515 ($path, $x, $y) = (undef, undef, undef);
2516 }
2517 }
2518
2420 my $map = eval { 2519 my $map = eval {
2421 my $map = cf::map::find $path; 2520 my $map = defined $path ? cf::map::find $path : undef;
2422 2521
2423 if ($map) { 2522 if ($map) {
2424 $map = $map->customise_for ($self); 2523 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map; 2524 $map = $check->($map) if $check && $map;
2426 } else { 2525 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2526 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2428 } 2527 }
2429 2528
2430 $map 2529 $map
2431 }; 2530 };
2432 2531
… …
2522 # if exit is damned, update players death & WoR home-position 2621 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp) 2622 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED); 2623 if $exit->flag (FLAG_DAMNED);
2525 2624
2526 (async { 2625 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2627
2527 $self->deactivate_recursive; # just to be sure 2628 $self->deactivate_recursive; # just to be sure
2528 unless (eval { 2629 unless (eval {
2529 $self->goto ($slaying, $hp, $sp); 2630 $self->goto ($slaying, $hp, $sp);
2530 2631
2531 1; 2632 1;
… …
2568 2669
2569=cut 2670=cut
2570 2671
2571our %CHANNEL = ( 2672our %CHANNEL = (
2572 "c/identify" => { 2673 "c/identify" => {
2573 id => "identify", 2674 id => "infobox",
2574 title => "Identify", 2675 title => "Identify",
2575 reply => undef, 2676 reply => undef,
2576 tooltip => "Items recently identified", 2677 tooltip => "Items recently identified",
2577 }, 2678 },
2578 "c/examine" => { 2679 "c/examine" => {
2579 id => "examine", 2680 id => "infobox",
2580 title => "Examine", 2681 title => "Examine",
2581 reply => undef, 2682 reply => undef,
2582 tooltip => "Signs and other items you examined", 2683 tooltip => "Signs and other items you examined",
2583 }, 2684 },
2685 "c/lookat" => {
2686 id => "infobox",
2687 title => "Look",
2688 reply => undef,
2689 tooltip => "What you saw there",
2690 },
2584); 2691);
2585 2692
2586sub cf::client::send_msg { 2693sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_; 2694 my ($self, $channel, $msg, $color, @extra) = @_;
2588 2695
2589 $msg = $self->pl->expand_cfpod ($msg); 2696 $msg = $self->pl->expand_cfpod ($msg);
2590 2697
2591 $color &= cf::NDI_CLIENT_MASK; # just in case... 2698 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592 2699
2593 # check predefined channels, for the benefit of C 2700 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2701 if ($CHANNEL{$channel}) {
2702 $channel = $CHANNEL{$channel};
2595 2703
2704 $self->ext_msg (channel_info => $channel)
2705 if $self->can_msg;
2706
2707 $channel = $channel->{id};
2708
2596 if (ref $channel) { 2709 } elsif (ref $channel) {
2597 # send meta info to client, if not yet sent 2710 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) { 2711 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel; 2712 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel) 2713 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg; 2714 if $self->can_msg;
… …
2818=pod 2931=pod
2819 2932
2820The following functions and methods are available within a safe environment: 2933The following functions and methods are available within a safe environment:
2821 2934
2822 cf::object 2935 cf::object
2823 contr pay_amount pay_player map x y force_find force_add 2936 contr pay_amount pay_player map x y force_find force_add destroy
2824 insert remove name archname title slaying race decrease_ob_nr 2937 insert remove name archname title slaying race decrease_ob_nr
2825 2938
2826 cf::object::player 2939 cf::object::player
2827 player 2940 player
2828 2941
… …
2835=cut 2948=cut
2836 2949
2837for ( 2950for (
2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race 2952 insert remove inv name archname title slaying race
2840 decrease_ob_nr)], 2953 decrease_ob_nr destroy)],
2841 ["cf::object::player" => qw(player)], 2954 ["cf::object::player" => qw(player)],
2842 ["cf::player" => qw(peaceful)], 2955 ["cf::player" => qw(peaceful)],
2843 ["cf::map" => qw(trigger)], 2956 ["cf::map" => qw(trigger)],
2844) { 2957) {
2845 no strict 'refs'; 2958 no strict 'refs';
… …
3120sub main { 3233sub main {
3121 # we must not ever block the main coroutine 3234 # we must not ever block the main coroutine
3122 local $Coro::idle = sub { 3235 local $Coro::idle = sub {
3123 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3124 (async { 3237 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER";
3125 Event::one_event; 3239 Event::one_event;
3126 })->prio (Coro::PRIO_MAX); 3240 })->prio (Coro::PRIO_MAX);
3127 }; 3241 };
3128 3242
3129 reload_config; 3243 reload_config;
… …
3201 # and maps saved/destroyed asynchronously. 3315 # and maps saved/destroyed asynchronously.
3202 warn "begin emergency player save\n"; 3316 warn "begin emergency player save\n";
3203 for my $login (keys %cf::PLAYER) { 3317 for my $login (keys %cf::PLAYER) {
3204 my $pl = $cf::PLAYER{$login} or next; 3318 my $pl = $cf::PLAYER{$login} or next;
3205 $pl->valid or next; 3319 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3206 $pl->save; 3321 $pl->save;
3207 } 3322 }
3208 warn "end emergency player save\n"; 3323 warn "end emergency player save\n";
3209 3324
3210 warn "begin emergency map save\n"; 3325 warn "begin emergency map save\n";
… …
3258 3373
3259 warn "flushing outstanding aio requests"; 3374 warn "flushing outstanding aio requests";
3260 for (;;) { 3375 for (;;) {
3261 BDB::flush; 3376 BDB::flush;
3262 IO::AIO::flush; 3377 IO::AIO::flush;
3263 Coro::cede; 3378 Coro::cede_notself;
3264 last unless IO::AIO::nreqs || BDB::nreqs; 3379 last unless IO::AIO::nreqs || BDB::nreqs;
3265 warn "iterate..."; 3380 warn "iterate...";
3266 } 3381 }
3267 3382
3268 ++$RELOAD; 3383 ++$RELOAD;
… …
3373register_command "reload" => sub { 3488register_command "reload" => sub {
3374 my ($who, $arg) = @_; 3489 my ($who, $arg) = @_;
3375 3490
3376 if ($who->flag (FLAG_WIZ)) { 3491 if ($who->flag (FLAG_WIZ)) {
3377 $who->message ("reloading server."); 3492 $who->message ("reloading server.");
3493 async {
3494 $Coro::current->{desc} = "perl_reload";
3378 async { reload_perl }; 3495 reload_perl;
3496 };
3379 } 3497 }
3380}; 3498};
3381 3499
3382unshift @INC, $LIBDIR; 3500unshift @INC, $LIBDIR;
3383 3501
… …
3402 my $signal = new Coro::Signal; 3520 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal; 3521 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait; 3522 $signal->wait;
3405} 3523}
3406 3524
3407 my $min = 1e6;#d#
3408 my $avg = 10;
3409$TICK_WATCHER = Event->timer ( 3525$TICK_WATCHER = Event->timer (
3410 reentrant => 0, 3526 reentrant => 0,
3411 parked => 1, 3527 parked => 1,
3412 prio => 0, 3528 prio => 0,
3413 at => $NEXT_TICK || $TICK, 3529 at => $NEXT_TICK || $TICK,
… …
3421 3537
3422 $NOW = $tick_start = Event::time; 3538 $NOW = $tick_start = Event::time;
3423 3539
3424 cf::server_tick; # one server iteration 3540 cf::server_tick; # one server iteration
3425 3541
3426 0 && sync_job {#d#
3427 for(1..10) {
3428 my $t = Event::time;
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3430 or die;
3431
3432 $map->width (50);
3433 $map->height (50);
3434 $map->alloc;
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3436 my $t = Event::time - $t;
3437
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 };
3448
3449 $RUNTIME += $TICK; 3542 $RUNTIME += $TICK;
3450 $NEXT_TICK += $TICK; 3543 $NEXT_TICK += $TICK;
3451 3544
3452 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3545 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3453 $NEXT_RUNTIME_WRITE = $NOW + 10; 3546 $NEXT_RUNTIME_WRITE = $NOW + 10;
3454 Coro::async_pool { 3547 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver";
3455 write_runtime 3549 write_runtime
3456 or warn "ERROR: unable to write runtime file: $!"; 3550 or warn "ERROR: unable to write runtime file: $!";
3457 }; 3551 };
3458 } 3552 }
3459 3553
3460# my $AFTER = Event::time;
3461# warn $AFTER - $NOW;#d#
3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send; 3555 $sig->send;
3465 } 3556 }
3466 while (my $sig = shift @WAIT_FOR_TICK) { 3557 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send; 3558 $sig->send;
… …
3477 3568
3478 $LOAD = ($NOW - $tick_start) / $TICK; 3569 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480 3571
3481 _post_tick; 3572 _post_tick;
3482
3483
3484 }, 3573 },
3485); 3574);
3486 3575
3487{ 3576{
3577 BDB::min_parallel 8;
3488 BDB::max_poll_time $TICK * 0.1; 3578 BDB::max_poll_time $TICK * 0.1;
3489 $BDB_POLL_WATCHER = Event->io ( 3579 $BDB_POLL_WATCHER = Event->io (
3490 reentrant => 0, 3580 reentrant => 0,
3491 fd => BDB::poll_fileno, 3581 fd => BDB::poll_fileno,
3492 poll => 'r', 3582 poll => 'r',
3493 prio => 0, 3583 prio => 0,
3494 data => WF_AUTOCANCEL, 3584 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb, 3585 cb => \&BDB::poll_cb,
3496 ); 3586 );
3497 BDB::min_parallel 8;
3498 3587
3499 BDB::set_sync_prepare { 3588 BDB::set_sync_prepare {
3500 my $status; 3589 my $status;
3501 my $current = $Coro::current; 3590 my $current = $Coro::current;
3502 ( 3591 (
… …
3511 ) 3600 )
3512 }; 3601 };
3513 3602
3514 unless ($DB_ENV) { 3603 unless ($DB_ENV) {
3515 $DB_ENV = BDB::db_env_create; 3604 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3606 | BDB::LOG_AUTOREMOVE, 1);
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3516 3609
3517 cf::sync_job { 3610 cf::sync_job {
3518 eval { 3611 eval {
3519 BDB::db_env_open 3612 BDB::db_env_open
3520 $DB_ENV, 3613 $DB_ENV,
… …
3522 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3615 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3616 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 3617 0666;
3525 3618
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3619 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3527
3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3529 $DB_ENV->set_lk_detect;
3530 }; 3620 };
3531 3621
3532 cf::cleanup "db_env_open(db): $@" if $@; 3622 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 3623 };
3534 } 3624 }
3625
3626 $BDB_DEADLOCK_WATCHER = Event->timer (
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 );
3636 $BDB_CHECKPOINT_WATCHER = Event->timer (
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 );
3646 $BDB_TRICKLE_WATCHER = Event->timer (
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 );
3535} 3656}
3536 3657
3537{ 3658{
3538 IO::AIO::min_parallel 8; 3659 IO::AIO::min_parallel 8;
3539 3660
… …
3542 $AIO_POLL_WATCHER = Event->io ( 3663 $AIO_POLL_WATCHER = Event->io (
3543 reentrant => 0, 3664 reentrant => 0,
3544 data => WF_AUTOCANCEL, 3665 data => WF_AUTOCANCEL,
3545 fd => IO::AIO::poll_fileno, 3666 fd => IO::AIO::poll_fileno,
3546 poll => 'r', 3667 poll => 'r',
3547 prio => 6, 3668 prio => 0,
3548 cb => \&IO::AIO::poll_cb, 3669 cb => \&IO::AIO::poll_cb,
3549 ); 3670 );
3550} 3671}
3551 3672
3552my $_log_backtrace; 3673my $_log_backtrace;
… …
3558 3679
3559 # limit the # of concurrent backtraces 3680 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) { 3681 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace; 3682 ++$_log_backtrace;
3562 async { 3683 async {
3684 $Coro::current->{desc} = "abt $msg";
3685
3563 my @bt = fork_call { 3686 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr; 3687 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3688 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3689 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567 or die "addr2line: $!"; 3690 or die "addr2line: $!";

Diff Legend

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