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.299 by root, Sun Jul 8 14:56:05 2007 UTC vs.
Revision 1.349 by root, Fri Aug 31 04:10:43 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
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;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
166 168
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
170 178
171=back 179=back
172 180
173=cut 181=cut
174 182
… …
264Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
267returned. 275returned.
268 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
269Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
271 282
272=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
273 284
… …
313 my $guard = Coro::guard { 324 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
315 }; 326 };
316 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
317 $guard 328 $guard
329}
330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
318} 385}
319 386
320=item cf::async { BLOCK } 387=item cf::async { BLOCK }
321 388
322Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
411 478
412=cut 479=cut
413 480
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422
423sub fork_call(&@) { 481sub fork_call(&@) {
424 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
425 483
426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 484 # we seemingly have to make a local copy of the whole thing,
427# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
429 or die "pipe: $!";
430 487
431 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 489 reset_signals;
445 local $SIG{__WARN__}; 490 &$cb
446 local $SIG{__DIE__}; 491 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 492
453 eval { 493 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 494}
466 495
467=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
468 497
469Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
549 if (1) { 578 if (1) {
550 $md5 = 579 $md5 =
551 join "\x00", 580 join "\x00",
552 $processversion, 581 $processversion,
553 map { 582 map {
554 Coro::cede; 583 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 585 } 0.. $#$src;
557 586
558 587
559 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
865 "; 894 ";
866 die if $@; 895 die if $@;
867} 896}
868 897
869our $override; 898our $override;
870our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871 900
872sub override { 901sub override {
873 $override = 1; 902 $override = 1;
874 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
875} 904}
876 905
877sub do_invoke { 906sub do_invoke {
878 my $event = shift; 907 my $event = shift;
879 my $callbacks = shift; 908 my $callbacks = shift;
880 909
881 @invoke_results = (); 910 @INVOKE_RESULTS = ();
882 911
883 local $override; 912 local $override;
884 913
885 for (@$callbacks) { 914 for (@$callbacks) {
886 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
903 932
904Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
905 934
906This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
908results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 938
910=back 939=back
911 940
912=cut 941=cut
913 942
914############################################################################# 943#############################################################################
915# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
916 956
917sub reattach { 957sub reattach {
918 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 959 my ($obj) = @_;
920 960
… …
1107 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1108 1148
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1150
1111 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1117 } else { 1166 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1168 }
1120 1169
1121 cf::override; 1170 cf::override;
… …
1276 1325
1277 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1279 1328
1280 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1281 Coro::cede; 1330 cf::cede_to_tick;
1282} 1331}
1283 1332
1284sub new($) { 1333sub new($) {
1285 my ($login) = @_; 1334 my ($login) = @_;
1286 1335
… …
1290 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1291 1340
1292 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1293 1342
1294 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1295} 1354}
1296 1355
1297=item $pl->quit_character 1356=item $pl->quit_character
1298 1357
1299Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1443sub hintmode { 1502sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1; 1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode} 1504 $_[0]{hintmode}
1446} 1505}
1447 1506
1448=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1449 1508
1450Sends an ext reply to the player. 1509Sends an ext reply to the player.
1451 1510
1452=cut 1511=cut
1453 1512
1454sub ext_reply($$%) { 1513sub ext_reply($$@) {
1455 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1456 1515
1457 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459} 1517}
1460 1518
1461=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1462 1520
1463Sends an ext event to the client. 1521Sends an ext event to the client.
1464 1522
1465=cut 1523=cut
1466 1524
1467sub ext_event($$%) { 1525sub ext_msg($$@) {
1468 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1469 1527
1470 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1471} 1529}
1472 1530
1473=head3 cf::region 1531=head3 cf::region
1474 1532
1475=over 4 1533=over 4
… …
1488 my ($path) = @_; 1546 my ($path) = @_;
1489 1547
1490 my ($match, $specificity); 1548 my ($match, $specificity);
1491 1549
1492 for my $region (list) { 1550 for my $region (list) {
1493 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1494 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1495 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1496 } 1554 }
1497 } 1555 }
1498 1556
… …
1618 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1619 return $self; 1677 return $self;
1620 } 1678 }
1621 } 1679 }
1622 1680
1623 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1624 () 1682 ()
1625} 1683}
1626 1684
1627sub init { 1685sub init {
1628 my ($self) = @_; 1686 my ($self) = @_;
… …
1794 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1795 1853
1796 my $path = $self->{path}; 1854 my $path = $self->{path};
1797 1855
1798 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1799 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1800 1859
1801 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1802 1861
1803 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1804 1863
1805 $self->alloc; 1864 $self->alloc;
1806 1865
1807 $self->pre_load; 1866 $self->pre_load;
1808 Coro::cede; 1867 cf::cede_to_tick;
1809 1868
1810 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1811 or return; 1870 or return;
1812 1871
1813 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1819 $self->clear_unique_items; 1878 $self->clear_unique_items;
1820 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1821 } 1880 }
1822 } 1881 }
1823 1882
1824 Coro::cede; 1883 cf::cede_to_tick;
1825 # now do the right thing for maps 1884 # now do the right thing for maps
1826 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1827 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1828 unless $self->difficulty; 1887 unless $self->difficulty;
1829 Coro::cede; 1888 cf::cede_to_tick;
1830 1889
1831 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1832 $self->decay_objects; 1891 $self->decay_objects;
1833 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1834 $self->update_buttons; 1893 $self->update_buttons;
1835 Coro::cede; 1894 cf::cede_to_tick;
1836 $self->set_darkness_map; 1895 $self->set_darkness_map;
1837 Coro::cede; 1896 cf::cede_to_tick;
1838 $self->activate; 1897 $self->activate;
1839 } 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1840 1902
1841 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1842 } 1904 }
1843 1905
1844 $self->post_load; 1906 $self->post_load;
… …
1855 1917
1856 $self 1918 $self
1857} 1919}
1858 1920
1859# find and load all maps in the 3x3 area around a map 1921# find and load all maps in the 3x3 area around a map
1860sub load_diag { 1922sub load_neighbours {
1861 my ($map) = @_; 1923 my ($map) = @_;
1862 1924
1863 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1864 1926
1865 for (0 .. 3) { 1927 for (0 .. 3) {
1866 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1867 or next; 1929 or next;
1868 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1869 or next; 1931 or next;
1870 $neigh->load; 1932 $neigh->load;
1871 1933
1934 push @neigh,
1872 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1873 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1874 } 1937 }
1875 1938
1876 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1877 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1878 or next; 1942 or next;
1879 $neigh->load; 1943 $neigh->load;
1880 } 1944 }
1881} 1945}
1882 1946
… …
1887} 1951}
1888 1952
1889sub do_load_sync { 1953sub do_load_sync {
1890 my ($map) = @_; 1954 my ($map) = @_;
1891 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1892 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1893} 1960}
1894 1961
1895our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1896our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1897 1964
1898sub find_async { 1965sub find_async {
1899 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1900 1967
1901 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1902 1969
1903 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1904 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1905 } 1972 }
1906 1973
1907 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1908 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1909 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1910 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1911 my $map = find $path 1979 if (my $map = find $k) {
1912 or next;
1913 $map->load; 1980 $map->load if $v;
1981 }
1914 1982
1915 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1916 } 1984 }
1917 } 1985 }
1918 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1919 }; 1987 };
1920 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1923} 1991}
1924 1992
1925sub save { 1993sub save {
1926 my ($self) = @_; 1994 my ($self) = @_;
1927 1995
1928 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1929 1997
1930 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1931 1999
1932 return unless $self->dirty; 2000 return unless $self->dirty;
1933 2001
… …
1956 my ($self) = @_; 2024 my ($self) = @_;
1957 2025
1958 # save first because save cedes 2026 # save first because save cedes
1959 $self->save; 2027 $self->save;
1960 2028
1961 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1962 2030
1963 return if $self->players; 2031 return if $self->players;
1964 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1965 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1966 2034
… …
2018my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2019 2087
2020sub nuke { 2088sub nuke {
2021 my ($self) = @_; 2089 my ($self) = @_;
2022 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2023 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2024 2095
2025 $self->unlink_save;
2026
2027 bless $self, "cf::map"; 2096 bless $self, "cf::map";
2028 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
2029 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
2030 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
2031 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032 2101
2102 $self->unlink_save;
2103
2033 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2034 2106
2035 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2036} 2108}
2037 2109
2038=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2145 2217
2146 } else { 2218 } else {
2147 my $pl = $self->contr; 2219 my $pl = $self->contr;
2148 2220
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2221 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog}; 2222 my $dialog = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply ( 2223 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157 2224
2158 } else { 2225 } else {
2159 $msg = $npc->name . " says: $msg" if $npc; 2226 $msg = $npc->name . " says: $msg" if $npc;
2160 $self->message ($msg, $flags); 2227 $self->message ($msg, $flags);
2161 } 2228 }
2162 } 2229 }
2230}
2231
2232=item $object->send_msg ($channel, $msg, $color, [extra...])
2233
2234=cut
2235
2236sub cf::object::send_msg {
2237 my $pl = shift->contr
2238 or return;
2239 $pl->send_msg (@_);
2163} 2240}
2164 2241
2165=item $player_object->may ("access") 2242=item $player_object->may ("access")
2166 2243
2167Returns wether the given player is authorized to access resource "access" 2244Returns wether the given player is authorized to access resource "access"
… …
2246 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
2247 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
2248 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
2249 2326
2250 $map->load; 2327 $map->load;
2251 $map->load_diag; 2328 $map->load_neighbours;
2252 2329
2253 return unless $self->contr->active; 2330 return unless $self->contr->active;
2254 $self->activate_recursive; 2331 $self->activate_recursive;
2255 2332
2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257 $self->enter_map ($map, $x, $y); 2334 $self->enter_map ($map, $x, $y);
2258} 2335}
2259 2336
2260=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2337=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261 2338
2262Moves the player to the given map-path and coordinates by first freezing 2339Moves the player to the given map-path and coordinates by first freezing
2263her, loading and preparing them map, calling the provided $check callback 2340her, loading and preparing them map, calling the provided $check callback
2264that has to return the map if sucecssful, and then unfreezes the player on 2341that has to return the map if sucecssful, and then unfreezes the player on
2265the new (success) or old (failed) map position. 2342the new (success) or old (failed) map position. In either case, $done will
2343be called at the end of this process.
2266 2344
2267=cut 2345=cut
2268 2346
2269our $GOTOGEN; 2347our $GOTOGEN;
2270 2348
2271sub cf::object::player::goto { 2349sub cf::object::player::goto {
2272 my ($self, $path, $x, $y, $check) = @_; 2350 my ($self, $path, $x, $y, $check, $done) = @_;
2273 2351
2274 # do generation counting so two concurrent goto's will be executed in-order 2352 # do generation counting so two concurrent goto's will be executed in-order
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276 2354
2277 $self->enter_link; 2355 $self->enter_link;
… …
2297 2375
2298 if ($gen == $self->{_goto_generation}) { 2376 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation}; 2377 delete $self->{_goto_generation};
2300 $self->leave_link ($map, $x, $y); 2378 $self->leave_link ($map, $x, $y);
2301 } 2379 }
2380
2381 $done->() if $done;
2302 })->prio (1); 2382 })->prio (1);
2303} 2383}
2304 2384
2305=item $player_object->enter_exit ($exit_object) 2385=item $player_object->enter_exit ($exit_object)
2306 2386
… …
2415 2495
2416 utf8::encode $text; 2496 utf8::encode $text;
2417 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2497 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2418} 2498}
2419 2499
2420=item $client->send_msg ($color, $type, $msg, [extra...]) 2500=item $client->send_msg ($channel, $msg, $color, [extra...])
2421 2501
2422Send a drawinfo or msg packet to the client, formatting the msg for the 2502Send a drawinfo or msg packet to the client, formatting the msg for the
2423client if neccessary. C<$type> should be a string identifying the type of 2503client if neccessary. C<$type> should be a string identifying the type of
2424the message, with C<log> being the default. If C<$color> is negative, suppress 2504the message, with C<log> being the default. If C<$color> is negative, suppress
2425the message unless the client supports the msg packet. 2505the message unless the client supports the msg packet.
2426 2506
2427=cut 2507=cut
2428 2508
2429sub cf::client::send_msg { 2509sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_; 2510 my ($self, $channel, $msg, $color, @extra) = @_;
2431 2511
2432 $msg = $self->pl->expand_cfpod ($msg); 2512 $msg = $self->pl->expand_cfpod ($msg);
2433 2513
2514 $color &= cf::NDI_CLIENT_MASK; # just in case...
2515
2516 if (ref $channel) {
2517 # send meta info to client, if not yet sent
2518 unless (exists $self->{channel}{$channel->{id}}) {
2519 $self->{channel}{$channel->{id}} = $channel;
2520 $self->ext_msg (channel_info => $channel);
2521 }
2522
2523 $channel = $channel->{id};
2524 }
2525
2434 return unless @extra || length $msg; 2526 return unless @extra || length $msg;
2435 2527
2436 if ($self->can_msg) { 2528 if ($self->can_msg) {
2529 # default colour, mask it out
2530 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2531 if $color & cf::NDI_DEF;
2532
2437 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2533 $self->send_packet ("msg " . $self->{json_coder}->encode (
2534 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2438 } else { 2535 } else {
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448
2449 if ($color >= 0) { 2536 if ($color >= 0) {
2537 # replace some tags by gcfclient-compatible ones
2538 for ($msg) {
2539 1 while
2540 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2541 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2542 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2543 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2544 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2545 }
2546
2547 $color &= cf::NDI_COLOR_MASK;
2548
2549 utf8::encode $msg;
2550
2450 if (0 && $msg =~ /\[/) { 2551 if (0 && $msg =~ /\[/) {
2552 # COMMAND/INFO
2451 $self->send_packet ("drawextinfo $color 4 0 $msg") 2553 $self->send_packet ("drawextinfo $color 10 8 $msg")
2452 } else { 2554 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg") 2556 $self->send_packet ("drawinfo $color $msg")
2455 } 2557 }
2456 } 2558 }
2457 } 2559 }
2458} 2560}
2459 2561
2460=item $client->ext_event ($type, %msg) 2562=item $client->ext_msg ($type, @msg)
2461 2563
2462Sends an ext event to the client. 2564Sends an ext event to the client.
2463 2565
2464=cut 2566=cut
2465 2567
2466sub cf::client::ext_event($$%) { 2568sub cf::client::ext_msg($$@) {
2467 my ($self, $type, %msg) = @_; 2569 my ($self, $type, @msg) = @_;
2468 2570
2571 if ($self->extcmd == 2) {
2572 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2573 } elsif ($self->extcmd == 1) { # TODO: remove
2469 $msg{msgtype} = "event_$type"; 2574 push @msg, msgtype => "event_$type";
2470 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2575 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2576 }
2577}
2578
2579=item $client->ext_reply ($msgid, @msg)
2580
2581Sends an ext reply to the client.
2582
2583=cut
2584
2585sub cf::client::ext_reply($$@) {
2586 my ($self, $id, @msg) = @_;
2587
2588 if ($self->extcmd == 2) {
2589 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2590 } elsif ($self->extcmd == 1) {
2591 #TODO: version 1, remove
2592 unshift @msg, msgtype => "reply", msgid => $id;
2593 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2594 }
2471} 2595}
2472 2596
2473=item $success = $client->query ($flags, "text", \&cb) 2597=item $success = $client->query ($flags, "text", \&cb)
2474 2598
2475Queues a query to the client, calling the given callback with 2599Queues a query to the client, calling the given callback with
… …
2530 my ($ns, $buf) = @_; 2654 my ($ns, $buf) = @_;
2531 2655
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2656 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533 2657
2534 if (ref $msg) { 2658 if (ref $msg) {
2659 my ($type, $reply, @payload) =
2660 "ARRAY" eq ref $msg
2661 ? @$msg
2662 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2663
2664 my @reply;
2665
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2666 if (my $cb = $EXTICMD{$type}) {
2536 if (my %reply = $cb->($ns, $msg)) { 2667 @reply = $cb->($ns, @payload);
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 } 2668 }
2669
2670 $ns->ext_reply ($reply, @reply)
2671 if $reply;
2672
2541 } else { 2673 } else {
2542 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2674 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543 } 2675 }
2544 2676
2545 cf::override; 2677 cf::override;
… …
2592our $safe = new Safe "safe"; 2724our $safe = new Safe "safe";
2593our $safe_hole = new Safe::Hole; 2725our $safe_hole = new Safe::Hole;
2594 2726
2595$SIG{FPE} = 'IGNORE'; 2727$SIG{FPE} = 'IGNORE';
2596 2728
2597$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2729$safe->permit_only (Opcode::opset qw(
2730 :base_core :base_mem :base_orig :base_math
2731 grepstart grepwhile mapstart mapwhile
2732 sort time
2733));
2598 2734
2599# here we export the classes and methods available to script code 2735# here we export the classes and methods available to script code
2600 2736
2601=pod 2737=pod
2602 2738
2603The following functions and methods are available within a safe environment: 2739The following functions and methods are available within a safe environment:
2604 2740
2605 cf::object 2741 cf::object
2606 contr pay_amount pay_player map x y force_find force_add 2742 contr pay_amount pay_player map x y force_find force_add
2607 insert remove 2743 insert remove name archname title slaying race decrease_ob_nr
2608 2744
2609 cf::object::player 2745 cf::object::player
2610 player 2746 player
2611 2747
2612 cf::player 2748 cf::player
… …
2617 2753
2618=cut 2754=cut
2619 2755
2620for ( 2756for (
2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2757 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2758 insert remove inv name archname title slaying race
2622 insert remove)], 2759 decrease_ob_nr)],
2623 ["cf::object::player" => qw(player)], 2760 ["cf::object::player" => qw(player)],
2624 ["cf::player" => qw(peaceful)], 2761 ["cf::player" => qw(peaceful)],
2625 ["cf::map" => qw(trigger)], 2762 ["cf::map" => qw(trigger)],
2626) { 2763) {
2627 no strict 'refs'; 2764 no strict 'refs';
… …
2703# the server's init and main functions 2840# the server's init and main functions
2704 2841
2705sub load_facedata($) { 2842sub load_facedata($) {
2706 my ($path) = @_; 2843 my ($path) = @_;
2707 2844
2845 # HACK to clear player env face cache, we need some signal framework
2846 # for this (global event?)
2847 %ext::player_env::MUSIC_FACE_CACHE = ();
2848
2849 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2850
2708 warn "loading facedata from $path\n"; 2851 warn "loading facedata from $path\n";
2709 2852
2710 my $facedata; 2853 my $facedata;
2711 0 < aio_load $path, $facedata 2854 0 < aio_load $path, $facedata
2712 or die "$path: $!"; 2855 or die "$path: $!";
… …
2714 $facedata = Coro::Storable::thaw $facedata; 2857 $facedata = Coro::Storable::thaw $facedata;
2715 2858
2716 $facedata->{version} == 2 2859 $facedata->{version} == 2
2717 or cf::cleanup "$path: version mismatch, cannot proceed."; 2860 or cf::cleanup "$path: version mismatch, cannot proceed.";
2718 2861
2862 # patch in the exptable
2863 $facedata->{resource}{"res/exp_table"} = {
2864 type => FT_RSRC,
2865 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2866 };
2867 cf::cede_to_tick;
2868
2719 { 2869 {
2720 my $faces = $facedata->{faceinfo}; 2870 my $faces = $facedata->{faceinfo};
2721 2871
2722 while (my ($face, $info) = each %$faces) { 2872 while (my ($face, $info) = each %$faces) {
2723 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2873 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2724 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2874 cf::face::set_visibility $idx, $info->{visibility};
2875 cf::face::set_magicmap $idx, $info->{magicmap};
2725 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2876 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2726 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2877 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2727 Coro::cede; 2878
2879 cf::cede_to_tick;
2728 } 2880 }
2729 2881
2730 while (my ($face, $info) = each %$faces) { 2882 while (my ($face, $info) = each %$faces) {
2731 next unless $info->{smooth}; 2883 next unless $info->{smooth};
2732 my $idx = cf::face::find $face 2884 my $idx = cf::face::find $face
2733 or next; 2885 or next;
2734 if (my $smooth = cf::face::find $info->{smooth}) { 2886 if (my $smooth = cf::face::find $info->{smooth}) {
2887 cf::face::set_smooth $idx, $smooth;
2735 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2888 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736 } else { 2889 } else {
2737 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2890 warn "smooth face '$info->{smooth}' not found for face '$face'";
2738 } 2891 }
2739 Coro::cede; 2892
2893 cf::cede_to_tick;
2740 } 2894 }
2741 } 2895 }
2742 2896
2743 { 2897 {
2744 my $anims = $facedata->{animinfo}; 2898 my $anims = $facedata->{animinfo};
2745 2899
2746 while (my ($anim, $info) = each %$anims) { 2900 while (my ($anim, $info) = each %$anims) {
2747 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2901 cf::anim::set $anim, $info->{frames}, $info->{facings};
2748 Coro::cede; 2902 cf::cede_to_tick;
2749 } 2903 }
2750 2904
2751 cf::anim::invalidate_all; # d'oh 2905 cf::anim::invalidate_all; # d'oh
2752 } 2906 }
2753 2907
2908 {
2909 # TODO: for gcfclient pleasure, we should give resources
2910 # that gcfclient doesn't grok a >10000 face index.
2911 my $res = $facedata->{resource};
2912
2913 my $soundconf = delete $res->{"res/sound.conf"};
2914
2915 while (my ($name, $info) = each %$res) {
2916 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2917 my $data;
2918
2919 if ($info->{type} & 1) {
2920 # prepend meta info
2921
2922 my $meta = $enc->encode ({
2923 name => $name,
2924 %{ $info->{meta} || {} },
2925 });
2926
2927 $data = pack "(w/a*)*", $meta, $info->{data};
2928 } else {
2929 $data = $info->{data};
2930 }
2931
2932 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2933 cf::face::set_type $idx, $info->{type};
2934
2935 cf::cede_to_tick;
2936 }
2937
2938 if ($soundconf) {
2939 $soundconf = $enc->decode (delete $soundconf->{data});
2940
2941 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2942 my $sound = $soundconf->{compat}[$_]
2943 or next;
2944
2945 my $face = cf::face::find "sound/$sound->[1]";
2946 cf::sound::set $sound->[0] => $face;
2947 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2948 }
2949
2950 while (my ($k, $v) = each %{$soundconf->{event}}) {
2951 my $face = cf::face::find "sound/$v";
2952 cf::sound::set $k => $face;
2953 }
2954 }
2955 }
2956
2754 1 2957 1
2755} 2958}
2756 2959
2960register_exticmd fx_want => sub {
2961 my ($ns, $want) = @_;
2962
2963 while (my ($k, $v) = each %$want) {
2964 $ns->fx_want ($k, $v);
2965 }
2966};
2967
2757sub reload_regions { 2968sub reload_regions {
2969 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = ();
2972
2758 load_resource_file "$MAPDIR/regions" 2973 load_resource_file "$MAPDIR/regions"
2759 or die "unable to load regions file\n"; 2974 or die "unable to load regions file\n";
2975
2976 for (cf::region::list) {
2977 $_->{match} = qr/$_->{match}/
2978 if exists $_->{match};
2979 }
2760} 2980}
2761 2981
2762sub reload_facedata { 2982sub reload_facedata {
2763 load_facedata "$DATADIR/facedata" 2983 load_facedata "$DATADIR/facedata"
2764 or die "unable to load facedata\n"; 2984 or die "unable to load facedata\n";
… …
2793 3013
2794sub init { 3014sub init {
2795 reload_resources; 3015 reload_resources;
2796} 3016}
2797 3017
2798sub cfg_load { 3018sub reload_config {
2799 open my $fh, "<:utf8", "$CONFDIR/config" 3019 open my $fh, "<:utf8", "$CONFDIR/config"
2800 or return; 3020 or return;
2801 3021
2802 local $/; 3022 local $/;
2803 *CFG = YAML::Syck::Load <$fh>; 3023 *CFG = YAML::Syck::Load <$fh>;
… …
2823 (async { 3043 (async {
2824 Event::one_event; 3044 Event::one_event;
2825 })->prio (Coro::PRIO_MAX); 3045 })->prio (Coro::PRIO_MAX);
2826 }; 3046 };
2827 3047
2828 cfg_load; 3048 reload_config;
2829 db_init; 3049 db_init;
2830 load_extensions; 3050 load_extensions;
2831 3051
2832 $TICK_WATCHER->start; 3052 $TICK_WATCHER->start;
2833 Event::loop; 3053 Event::loop;
… …
3026 warn "reloading cf.pm"; 3246 warn "reloading cf.pm";
3027 require cf; 3247 require cf;
3028 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3248 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3029 3249
3030 warn "loading config and database again"; 3250 warn "loading config and database again";
3031 cf::cfg_load; 3251 cf::reload_config;
3032 3252
3033 warn "loading extensions"; 3253 warn "loading extensions";
3034 cf::load_extensions; 3254 cf::load_extensions;
3035 3255
3036 warn "reattaching attachments to objects/players"; 3256 warn "reattaching attachments to objects/players";

Diff Legend

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