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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.350 by root, Sat Sep 1 08:03:45 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
… …
412=cut 479=cut
413 480
414sub fork_call(&@) { 481sub fork_call(&@) {
415 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
416 483
417# 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,
418# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
420 or die "pipe: $!";
421 487
422 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 489 reset_signals;
436 local $SIG{__WARN__}; 490 &$cb
437 local $SIG{__DIE__}; 491 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 492
443 my @res = eval { $cb->(@args) }; 493 wantarray ? @res : $res[-1]
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
459 }
460} 494}
461 495
462=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
463 497
464Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
544 if (1) { 578 if (1) {
545 $md5 = 579 $md5 =
546 join "\x00", 580 join "\x00",
547 $processversion, 581 $processversion,
548 map { 582 map {
549 Coro::cede; 583 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 585 } 0.. $#$src;
552 586
553 587
554 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
860 "; 894 ";
861 die if $@; 895 die if $@;
862} 896}
863 897
864our $override; 898our $override;
865our @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?
866 900
867sub override { 901sub override {
868 $override = 1; 902 $override = 1;
869 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
870} 904}
871 905
872sub do_invoke { 906sub do_invoke {
873 my $event = shift; 907 my $event = shift;
874 my $callbacks = shift; 908 my $callbacks = shift;
875 909
876 @invoke_results = (); 910 @INVOKE_RESULTS = ();
877 911
878 local $override; 912 local $override;
879 913
880 for (@$callbacks) { 914 for (@$callbacks) {
881 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
898 932
899Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
900 934
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 938
905=back 939=back
906 940
907=cut 941=cut
908 942
909############################################################################# 943#############################################################################
910# 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}
911 956
912sub reattach { 957sub reattach {
913 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 959 my ($obj) = @_;
915 960
… …
1102 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1103 1148
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1150
1106 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
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1112 } else { 1166 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1168 }
1115 1169
1116 cf::override; 1170 cf::override;
… …
1271 1325
1272 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1274 1328
1275 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1276 Coro::cede; 1330 cf::cede_to_tick;
1277} 1331}
1278 1332
1279sub new($) { 1333sub new($) {
1280 my ($login) = @_; 1334 my ($login) = @_;
1281 1335
… …
1285 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1286 1340
1287 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1288 1342
1289 $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 (@_);
1290} 1354}
1291 1355
1292=item $pl->quit_character 1356=item $pl->quit_character
1293 1357
1294Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1438sub hintmode { 1502sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1504 $_[0]{hintmode}
1441} 1505}
1442 1506
1443=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1444 1508
1445Sends an ext reply to the player. 1509Sends an ext reply to the player.
1446 1510
1447=cut 1511=cut
1448 1512
1449sub ext_reply($$%) { 1513sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1451 1515
1452 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1517}
1455 1518
1456=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1457 1520
1458Sends an ext event to the client. 1521Sends an ext event to the client.
1459 1522
1460=cut 1523=cut
1461 1524
1462sub ext_event($$%) { 1525sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1464 1527
1465 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1466} 1529}
1467 1530
1468=head3 cf::region 1531=head3 cf::region
1469 1532
1470=over 4 1533=over 4
… …
1483 my ($path) = @_; 1546 my ($path) = @_;
1484 1547
1485 my ($match, $specificity); 1548 my ($match, $specificity);
1486 1549
1487 for my $region (list) { 1550 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1491 } 1554 }
1492 } 1555 }
1493 1556
… …
1613 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1614 return $self; 1677 return $self;
1615 } 1678 }
1616 } 1679 }
1617 1680
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1682 ()
1620} 1683}
1621 1684
1622sub init { 1685sub init {
1623 my ($self) = @_; 1686 my ($self) = @_;
… …
1789 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1790 1853
1791 my $path = $self->{path}; 1854 my $path = $self->{path};
1792 1855
1793 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1794 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1795 1859
1796 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1797 1861
1798 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1799 1863
1800 $self->alloc; 1864 $self->alloc;
1801 1865
1802 $self->pre_load; 1866 $self->pre_load;
1803 Coro::cede; 1867 cf::cede_to_tick;
1804 1868
1805 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1806 or return; 1870 or return;
1807 1871
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1814 $self->clear_unique_items; 1878 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1816 } 1880 }
1817 } 1881 }
1818 1882
1819 Coro::cede; 1883 cf::cede_to_tick;
1820 # now do the right thing for maps 1884 # now do the right thing for maps
1821 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 1887 unless $self->difficulty;
1824 Coro::cede; 1888 cf::cede_to_tick;
1825 1889
1826 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 1891 $self->decay_objects;
1828 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1829 $self->update_buttons; 1893 $self->update_buttons;
1830 Coro::cede; 1894 cf::cede_to_tick;
1831 $self->set_darkness_map; 1895 $self->set_darkness_map;
1832 Coro::cede; 1896 cf::cede_to_tick;
1833 $self->activate; 1897 $self->activate;
1834 } 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1835 1902
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1904 }
1838 1905
1839 $self->post_load; 1906 $self->post_load;
… …
1850 1917
1851 $self 1918 $self
1852} 1919}
1853 1920
1854# 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
1855sub load_diag { 1922sub load_neighbours {
1856 my ($map) = @_; 1923 my ($map) = @_;
1857 1924
1858 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1859 1926
1860 for (0 .. 3) { 1927 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1862 or next; 1929 or next;
1863 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1864 or next; 1931 or next;
1865 $neigh->load; 1932 $neigh->load;
1866 1933
1934 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 1937 }
1870 1938
1871 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1873 or next; 1942 or next;
1874 $neigh->load; 1943 $neigh->load;
1875 } 1944 }
1876} 1945}
1877 1946
… …
1882} 1951}
1883 1952
1884sub do_load_sync { 1953sub do_load_sync {
1885 my ($map) = @_; 1954 my ($map) = @_;
1886 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1887 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1888} 1960}
1889 1961
1890our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1892 1964
1893sub find_async { 1965sub find_async {
1894 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1895 1967
1896 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1897 1969
1898 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 1972 }
1901 1973
1902 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1903 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 1979 if (my $map = find $k) {
1907 or next;
1908 $map->load; 1980 $map->load if $v;
1981 }
1909 1982
1910 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1911 } 1984 }
1912 } 1985 }
1913 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1914 }; 1987 };
1915 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1918} 1991}
1919 1992
1920sub save { 1993sub save {
1921 my ($self) = @_; 1994 my ($self) = @_;
1922 1995
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 1997
1925 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1926 1999
1927 return unless $self->dirty; 2000 return unless $self->dirty;
1928 2001
… …
1951 my ($self) = @_; 2024 my ($self) = @_;
1952 2025
1953 # save first because save cedes 2026 # save first because save cedes
1954 $self->save; 2027 $self->save;
1955 2028
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2030
1958 return if $self->players; 2031 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1961 2034
… …
2013my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2014 2087
2015sub nuke { 2088sub nuke {
2016 my ($self) = @_; 2089 my ($self) = @_;
2017 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2018 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2019 2095
2020 $self->unlink_save;
2021
2022 bless $self, "cf::map"; 2096 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2101
2102 $self->unlink_save;
2103
2028 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2029 2106
2030 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2031} 2108}
2032 2109
2033=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2140 2217
2141 } else { 2218 } else {
2142 my $pl = $self->contr; 2219 my $pl = $self->contr;
2143 2220
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2221 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2222 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2223 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2224
2153 } else { 2225 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2226 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2227 $self->message ($msg, $flags);
2156 } 2228 }
2157 } 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 (@_);
2158} 2240}
2159 2241
2160=item $player_object->may ("access") 2242=item $player_object->may ("access")
2161 2243
2162Returns wether the given player is authorized to access resource "access" 2244Returns wether the given player is authorized to access resource "access"
… …
2241 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
2244 2326
2245 $map->load; 2327 $map->load;
2246 $map->load_diag; 2328 $map->load_neighbours;
2247 2329
2248 return unless $self->contr->active; 2330 return unless $self->contr->active;
2249 $self->activate_recursive; 2331 $self->activate_recursive;
2250 2332
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2334 $self->enter_map ($map, $x, $y);
2253} 2335}
2254 2336
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2337=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2338
2257Moves 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
2258her, loading and preparing them map, calling the provided $check callback 2340her, loading and preparing them map, calling the provided $check callback
2259that 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
2260the 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.
2261 2344
2262=cut 2345=cut
2263 2346
2264our $GOTOGEN; 2347our $GOTOGEN;
2265 2348
2266sub cf::object::player::goto { 2349sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2350 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2351
2269 # 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
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2354
2272 $self->enter_link; 2355 $self->enter_link;
… …
2292 2375
2293 if ($gen == $self->{_goto_generation}) { 2376 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2377 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2378 $self->leave_link ($map, $x, $y);
2296 } 2379 }
2380
2381 $done->() if $done;
2297 })->prio (1); 2382 })->prio (1);
2298} 2383}
2299 2384
2300=item $player_object->enter_exit ($exit_object) 2385=item $player_object->enter_exit ($exit_object)
2301 2386
… …
2410 2495
2411 utf8::encode $text; 2496 utf8::encode $text;
2412 $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);
2413} 2498}
2414 2499
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2500=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2501
2417Send 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
2418client 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
2419the 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
2420the message unless the client supports the msg packet. 2505the message unless the client supports the msg packet.
2421 2506
2422=cut 2507=cut
2423 2508
2509our %CHANNEL = (
2510 "c/identify" => {
2511 id => "identify",
2512 title => "Identify",
2513 reply => undef,
2514 tooltip => "Items recently identified",
2515 },
2516);
2517
2424sub cf::client::send_msg { 2518sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2519 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2520
2427 $msg = $self->pl->expand_cfpod ($msg); 2521 $msg = $self->pl->expand_cfpod ($msg);
2428 2522
2523 $color &= cf::NDI_CLIENT_MASK; # just in case...
2524
2525 # check predefined channels, for the benefit of C
2526 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2527
2528 if (ref $channel) {
2529 # send meta info to client, if not yet sent
2530 unless (exists $self->{channel}{$channel->{id}}) {
2531 $self->{channel}{$channel->{id}} = $channel;
2532 $self->ext_msg (channel_info => $channel);
2533 }
2534
2535 $channel = $channel->{id};
2536 }
2537
2429 return unless @extra || length $msg; 2538 return unless @extra || length $msg;
2430 2539
2431 if ($self->can_msg) { 2540 if ($self->can_msg) {
2541 # default colour, mask it out
2542 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2543 if $color & cf::NDI_DEF;
2544
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2545 $self->send_packet ("msg " . $self->{json_coder}->encode (
2546 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433 } else { 2547 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) { 2548 if ($color >= 0) {
2549 # replace some tags by gcfclient-compatible ones
2550 for ($msg) {
2551 1 while
2552 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2553 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2554 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2555 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2556 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2557 }
2558
2559 $color &= cf::NDI_COLOR_MASK;
2560
2561 utf8::encode $msg;
2562
2445 if (0 && $msg =~ /\[/) { 2563 if (0 && $msg =~ /\[/) {
2564 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2565 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2566 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2567 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2568 $self->send_packet ("drawinfo $color $msg")
2450 } 2569 }
2451 } 2570 }
2452 } 2571 }
2453} 2572}
2454 2573
2455=item $client->ext_event ($type, %msg) 2574=item $client->ext_msg ($type, @msg)
2456 2575
2457Sends an ext event to the client. 2576Sends an ext event to the client.
2458 2577
2459=cut 2578=cut
2460 2579
2461sub cf::client::ext_event($$%) { 2580sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2581 my ($self, $type, @msg) = @_;
2463 2582
2583 if ($self->extcmd == 2) {
2584 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2585 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2586 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 }
2589}
2590
2591=item $client->ext_reply ($msgid, @msg)
2592
2593Sends an ext reply to the client.
2594
2595=cut
2596
2597sub cf::client::ext_reply($$@) {
2598 my ($self, $id, @msg) = @_;
2599
2600 if ($self->extcmd == 2) {
2601 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2602 } elsif ($self->extcmd == 1) {
2603 #TODO: version 1, remove
2604 unshift @msg, msgtype => "reply", msgid => $id;
2605 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2606 }
2466} 2607}
2467 2608
2468=item $success = $client->query ($flags, "text", \&cb) 2609=item $success = $client->query ($flags, "text", \&cb)
2469 2610
2470Queues a query to the client, calling the given callback with 2611Queues a query to the client, calling the given callback with
… …
2525 my ($ns, $buf) = @_; 2666 my ($ns, $buf) = @_;
2526 2667
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2668 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2669
2529 if (ref $msg) { 2670 if (ref $msg) {
2671 my ($type, $reply, @payload) =
2672 "ARRAY" eq ref $msg
2673 ? @$msg
2674 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2675
2676 my @reply;
2677
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2678 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2679 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2680 }
2681
2682 $ns->ext_reply ($reply, @reply)
2683 if $reply;
2684
2536 } else { 2685 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2686 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 } 2687 }
2539 2688
2540 cf::override; 2689 cf::override;
… …
2587our $safe = new Safe "safe"; 2736our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 2737our $safe_hole = new Safe::Hole;
2589 2738
2590$SIG{FPE} = 'IGNORE'; 2739$SIG{FPE} = 'IGNORE';
2591 2740
2592$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2741$safe->permit_only (Opcode::opset qw(
2742 :base_core :base_mem :base_orig :base_math
2743 grepstart grepwhile mapstart mapwhile
2744 sort time
2745));
2593 2746
2594# here we export the classes and methods available to script code 2747# here we export the classes and methods available to script code
2595 2748
2596=pod 2749=pod
2597 2750
2598The following functions and methods are available within a safe environment: 2751The following functions and methods are available within a safe environment:
2599 2752
2600 cf::object 2753 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 2754 contr pay_amount pay_player map x y force_find force_add
2602 insert remove 2755 insert remove name archname title slaying race decrease_ob_nr
2603 2756
2604 cf::object::player 2757 cf::object::player
2605 player 2758 player
2606 2759
2607 cf::player 2760 cf::player
… …
2612 2765
2613=cut 2766=cut
2614 2767
2615for ( 2768for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2769 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2770 insert remove inv name archname title slaying race
2617 insert remove)], 2771 decrease_ob_nr)],
2618 ["cf::object::player" => qw(player)], 2772 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 2773 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 2774 ["cf::map" => qw(trigger)],
2621) { 2775) {
2622 no strict 'refs'; 2776 no strict 'refs';
… …
2698# the server's init and main functions 2852# the server's init and main functions
2699 2853
2700sub load_facedata($) { 2854sub load_facedata($) {
2701 my ($path) = @_; 2855 my ($path) = @_;
2702 2856
2857 # HACK to clear player env face cache, we need some signal framework
2858 # for this (global event?)
2859 %ext::player_env::MUSIC_FACE_CACHE = ();
2860
2861 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2862
2703 warn "loading facedata from $path\n"; 2863 warn "loading facedata from $path\n";
2704 2864
2705 my $facedata; 2865 my $facedata;
2706 0 < aio_load $path, $facedata 2866 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 2867 or die "$path: $!";
… …
2709 $facedata = Coro::Storable::thaw $facedata; 2869 $facedata = Coro::Storable::thaw $facedata;
2710 2870
2711 $facedata->{version} == 2 2871 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 2872 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 2873
2874 # patch in the exptable
2875 $facedata->{resource}{"res/exp_table"} = {
2876 type => FT_RSRC,
2877 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2878 };
2879 cf::cede_to_tick;
2880
2714 { 2881 {
2715 my $faces = $facedata->{faceinfo}; 2882 my $faces = $facedata->{faceinfo};
2716 2883
2717 while (my ($face, $info) = each %$faces) { 2884 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2885 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2886 cf::face::set_visibility $idx, $info->{visibility};
2887 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2888 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2889 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 2890
2891 cf::cede_to_tick;
2723 } 2892 }
2724 2893
2725 while (my ($face, $info) = each %$faces) { 2894 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 2895 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 2896 my $idx = cf::face::find $face
2728 or next; 2897 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 2898 if (my $smooth = cf::face::find $info->{smooth}) {
2899 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2900 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 2901 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2902 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 2903 }
2734 Coro::cede; 2904
2905 cf::cede_to_tick;
2735 } 2906 }
2736 } 2907 }
2737 2908
2738 { 2909 {
2739 my $anims = $facedata->{animinfo}; 2910 my $anims = $facedata->{animinfo};
2740 2911
2741 while (my ($anim, $info) = each %$anims) { 2912 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2913 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 2914 cf::cede_to_tick;
2744 } 2915 }
2745 2916
2746 cf::anim::invalidate_all; # d'oh 2917 cf::anim::invalidate_all; # d'oh
2747 } 2918 }
2748 2919
2920 {
2921 # TODO: for gcfclient pleasure, we should give resources
2922 # that gcfclient doesn't grok a >10000 face index.
2923 my $res = $facedata->{resource};
2924
2925 my $soundconf = delete $res->{"res/sound.conf"};
2926
2927 while (my ($name, $info) = each %$res) {
2928 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2929 my $data;
2930
2931 if ($info->{type} & 1) {
2932 # prepend meta info
2933
2934 my $meta = $enc->encode ({
2935 name => $name,
2936 %{ $info->{meta} || {} },
2937 });
2938
2939 $data = pack "(w/a*)*", $meta, $info->{data};
2940 } else {
2941 $data = $info->{data};
2942 }
2943
2944 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2945 cf::face::set_type $idx, $info->{type};
2946
2947 cf::cede_to_tick;
2948 }
2949
2950 if ($soundconf) {
2951 $soundconf = $enc->decode (delete $soundconf->{data});
2952
2953 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2954 my $sound = $soundconf->{compat}[$_]
2955 or next;
2956
2957 my $face = cf::face::find "sound/$sound->[1]";
2958 cf::sound::set $sound->[0] => $face;
2959 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2960 }
2961
2962 while (my ($k, $v) = each %{$soundconf->{event}}) {
2963 my $face = cf::face::find "sound/$v";
2964 cf::sound::set $k => $face;
2965 }
2966 }
2967 }
2968
2749 1 2969 1
2750} 2970}
2751 2971
2972register_exticmd fx_want => sub {
2973 my ($ns, $want) = @_;
2974
2975 while (my ($k, $v) = each %$want) {
2976 $ns->fx_want ($k, $v);
2977 }
2978};
2979
2752sub reload_regions { 2980sub reload_regions {
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2753 load_resource_file "$MAPDIR/regions" 2985 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 2986 or die "unable to load regions file\n";
2987
2988 for (cf::region::list) {
2989 $_->{match} = qr/$_->{match}/
2990 if exists $_->{match};
2991 }
2755} 2992}
2756 2993
2757sub reload_facedata { 2994sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 2995 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 2996 or die "unable to load facedata\n";
… …
2788 3025
2789sub init { 3026sub init {
2790 reload_resources; 3027 reload_resources;
2791} 3028}
2792 3029
2793sub cfg_load { 3030sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3031 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3032 or return;
2796 3033
2797 local $/; 3034 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3035 *CFG = YAML::Syck::Load <$fh>;
… …
2818 (async { 3055 (async {
2819 Event::one_event; 3056 Event::one_event;
2820 })->prio (Coro::PRIO_MAX); 3057 })->prio (Coro::PRIO_MAX);
2821 }; 3058 };
2822 3059
2823 cfg_load; 3060 reload_config;
2824 db_init; 3061 db_init;
2825 load_extensions; 3062 load_extensions;
2826 3063
2827 $TICK_WATCHER->start; 3064 $TICK_WATCHER->start;
2828 Event::loop; 3065 Event::loop;
… …
3021 warn "reloading cf.pm"; 3258 warn "reloading cf.pm";
3022 require cf; 3259 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3260 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3261
3025 warn "loading config and database again"; 3262 warn "loading config and database again";
3026 cf::cfg_load; 3263 cf::reload_config;
3027 3264
3028 warn "loading extensions"; 3265 warn "loading extensions";
3029 cf::load_extensions; 3266 cf::load_extensions;
3030 3267
3031 warn "reattaching attachments to objects/players"; 3268 warn "reattaching attachments to objects/players";

Diff Legend

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