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.308 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.352 by root, Sun Sep 2 04:57:14 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 ();
166=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
167 168
168These 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
169returns 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
170per 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.
171 178
172=back 179=back
173 180
174=cut 181=cut
175 182
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
268returned. 275returned.
269 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
270Lock 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
271uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
272 282
273=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
274 284
314 my $guard = Coro::guard { 324 my $guard = Coro::guard {
315 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
316 }; 326 };
317 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
318 $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;
319} 385}
320 386
321=item cf::async { BLOCK } 387=item cf::async { BLOCK }
322 388
323Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
410Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
412 478
413=cut 479=cut
414 480
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423
424sub fork_call(&@) { 481sub fork_call(&@) {
425 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
426 483
427# 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,
428# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
430 or die "pipe: $!";
431 487
432 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 489 reset_signals;
446 local $SIG{__WARN__}; 490 &$cb
447 local $SIG{__DIE__}; 491 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 492
454 eval { 493 wantarray ? @res : $res[-1]
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 }
466} 494}
467 495
468=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
469 497
470Returns a single value from the environment database. 498Returns a single value from the environment database.
550 if (1) { 578 if (1) {
551 $md5 = 579 $md5 =
552 join "\x00", 580 join "\x00",
553 $processversion, 581 $processversion,
554 map { 582 map {
555 Coro::cede; 583 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 585 } 0.. $#$src;
558 586
559 587
560 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
866 "; 894 ";
867 die if $@; 895 die if $@;
868} 896}
869 897
870our $override; 898our $override;
871our @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?
872 900
873sub override { 901sub override {
874 $override = 1; 902 $override = 1;
875 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
876} 904}
877 905
878sub do_invoke { 906sub do_invoke {
879 my $event = shift; 907 my $event = shift;
880 my $callbacks = shift; 908 my $callbacks = shift;
881 909
882 @invoke_results = (); 910 @INVOKE_RESULTS = ();
883 911
884 local $override; 912 local $override;
885 913
886 for (@$callbacks) { 914 for (@$callbacks) {
887 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
904 932
905Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
906 934
907This 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
908removed 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
909results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 938
911=back 939=back
912 940
913=cut 941=cut
914 942
915############################################################################# 943#############################################################################
916# 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}
917 956
918sub reattach { 957sub reattach {
919 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 959 my ($obj) = @_;
921 960
1108 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1109 1148
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1150
1112 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
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1118 } else { 1166 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1168 }
1121 1169
1122 cf::override; 1170 cf::override;
1277 1325
1278 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1280 1328
1281 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1282 Coro::cede; 1330 cf::cede_to_tick;
1283} 1331}
1284 1332
1285sub new($) { 1333sub new($) {
1286 my ($login) = @_; 1334 my ($login) = @_;
1287 1335
1291 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1292 1340
1293 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1294 1342
1295 $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 (@_);
1296} 1354}
1297 1355
1298=item $pl->quit_character 1356=item $pl->quit_character
1299 1357
1300Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1405sub expand_cfpod { 1463sub expand_cfpod {
1406 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1407 1465
1408 # escape & and < 1466 # escape & and <
1409 s/&/&amp;/g; 1467 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1411 1469
1412 # this is buggy, it needs to properly take care of nested <'s 1470 # this is buggy, it needs to properly take care of nested <'s
1413 1471
1414 1 while 1472 1 while
1415 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1419 # replace G<male|female> tags 1478 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1422 }ge 1481 }ge
1423 # replace H<hint text> 1482 # replace H<hint text>
1444sub hintmode { 1503sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1505 $_[0]{hintmode}
1447} 1506}
1448 1507
1449=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1450 1509
1451Sends an ext reply to the player. 1510Sends an ext reply to the player.
1452 1511
1453=cut 1512=cut
1454 1513
1455sub ext_reply($$%) { 1514sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1457 1516
1458 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1518}
1461 1519
1462=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1463 1521
1464Sends an ext event to the client. 1522Sends an ext event to the client.
1465 1523
1466=cut 1524=cut
1467 1525
1468sub ext_event($$%) { 1526sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1470 1528
1471 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1472} 1530}
1473 1531
1474=head3 cf::region 1532=head3 cf::region
1475 1533
1476=over 4 1534=over 4
1795 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1796 1854
1797 my $path = $self->{path}; 1855 my $path = $self->{path};
1798 1856
1799 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1800 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1801 1860
1802 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1803 1862
1804 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1805 1864
1806 $self->alloc; 1865 $self->alloc;
1807 1866
1808 $self->pre_load; 1867 $self->pre_load;
1809 Coro::cede; 1868 cf::cede_to_tick;
1810 1869
1811 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1812 or return; 1871 or return;
1813 1872
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1820 $self->clear_unique_items; 1879 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1822 } 1881 }
1823 } 1882 }
1824 1883
1825 Coro::cede; 1884 cf::cede_to_tick;
1826 # now do the right thing for maps 1885 # now do the right thing for maps
1827 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 1888 unless $self->difficulty;
1830 Coro::cede; 1889 cf::cede_to_tick;
1831 1890
1832 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 1892 $self->decay_objects;
1834 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1835 $self->update_buttons; 1894 $self->update_buttons;
1836 Coro::cede; 1895 cf::cede_to_tick;
1837 $self->set_darkness_map; 1896 $self->set_darkness_map;
1838 Coro::cede; 1897 cf::cede_to_tick;
1839 $self->activate; 1898 $self->activate;
1840 } 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1841 1903
1842 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 1905 }
1844 1906
1845 $self->post_load; 1907 $self->post_load;
1856 1918
1857 $self 1919 $self
1858} 1920}
1859 1921
1860# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1861sub load_diag { 1923sub load_neighbours {
1862 my ($map) = @_; 1924 my ($map) = @_;
1863 1925
1864 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1865 1927
1866 for (0 .. 3) { 1928 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1868 or next; 1930 or next;
1869 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1870 or next; 1932 or next;
1871 $neigh->load; 1933 $neigh->load;
1872 1934
1935 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 1938 }
1876 1939
1877 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1879 or next; 1943 or next;
1880 $neigh->load; 1944 $neigh->load;
1881 } 1945 }
1882} 1946}
1883 1947
1888} 1952}
1889 1953
1890sub do_load_sync { 1954sub do_load_sync {
1891 my ($map) = @_; 1955 my ($map) = @_;
1892 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1893 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1894} 1961}
1895 1962
1896our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1898 1965
1899sub find_async { 1966sub find_async {
1900 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1901 1968
1902 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1903 1970
1904 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 1973 }
1907 1974
1908 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1909 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1910 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 if (my $map = find $path) { 1980 if (my $map = find $k) {
1913 $map->load; 1981 $map->load if $v;
1914 } 1982 }
1915 1983
1916 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1917 } 1985 }
1918 } 1986 }
1919 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1920 }; 1988 };
1921 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
1924} 1992}
1925 1993
1926sub save { 1994sub save {
1927 my ($self) = @_; 1995 my ($self) = @_;
1928 1996
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 1998
1931 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1932 2000
1933 return unless $self->dirty; 2001 return unless $self->dirty;
1934 2002
1957 my ($self) = @_; 2025 my ($self) = @_;
1958 2026
1959 # save first because save cedes 2027 # save first because save cedes
1960 $self->save; 2028 $self->save;
1961 2029
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2031
1964 return if $self->players; 2032 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1967 2035
2019my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2020 2088
2021sub nuke { 2089sub nuke {
2022 my ($self) = @_; 2090 my ($self) = @_;
2023 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2024 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2025 2096
2026 $self->unlink_save; 2097 $self->unlink_save;
2027 2098
2028 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2104
2034 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2035 2107
2036 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2037} 2109}
2038 2110
2039=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
2146 2218
2147 } else { 2219 } else {
2148 my $pl = $self->contr; 2220 my $pl = $self->contr;
2149 2221
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2223 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2225
2159 } else { 2226 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2162 } 2229 }
2163 } 2230 }
2231}
2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
2164} 2241}
2165 2242
2166=item $player_object->may ("access") 2243=item $player_object->may ("access")
2167 2244
2168Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2250 2327
2251 $map->load; 2328 $map->load;
2252 $map->load_diag; 2329 $map->load_neighbours;
2253 2330
2254 return unless $self->contr->active; 2331 return unless $self->contr->active;
2255 $self->activate_recursive; 2332 $self->activate_recursive;
2256 2333
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2419 2496
2420 utf8::encode $text; 2497 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2499}
2423 2500
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2502
2426Send a drawinfo or msg packet to the client, formatting the msg for the 2503Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of 2504client if neccessary. C<$type> should be a string identifying the type of
2428the message, with C<log> being the default. If C<$color> is negative, suppress 2505the message, with C<log> being the default. If C<$color> is negative, suppress
2429the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2430 2507
2431=cut 2508=cut
2432 2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2433sub cf::client::send_msg { 2525sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2527
2436 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2437 2529
2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2534
2535 if (ref $channel) {
2536 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel);
2540 }
2541
2542 $channel = $channel->{id};
2543 }
2544
2438 return unless @extra || length $msg; 2545 return unless @extra || length $msg;
2439 2546
2440 if ($self->can_msg) { 2547 if ($self->can_msg) {
2548 # default colour, mask it out
2549 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2550 if $color & cf::NDI_DEF;
2551
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2552 $self->send_packet ("msg " . $self->{json_coder}->encode (
2553 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2442 } else { 2554 } else {
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452
2453 if ($color >= 0) { 2555 if ($color >= 0) {
2556 # replace some tags by gcfclient-compatible ones
2557 for ($msg) {
2558 1 while
2559 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2560 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2561 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2562 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2563 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2564 }
2565
2566 $color &= cf::NDI_COLOR_MASK;
2567
2568 utf8::encode $msg;
2569
2454 if (0 && $msg =~ /\[/) { 2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2456 } else { 2573 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg") 2575 $self->send_packet ("drawinfo $color $msg")
2459 } 2576 }
2460 } 2577 }
2461 } 2578 }
2462} 2579}
2463 2580
2464=item $client->ext_event ($type, %msg) 2581=item $client->ext_msg ($type, @msg)
2465 2582
2466Sends an ext event to the client. 2583Sends an ext event to the client.
2467 2584
2468=cut 2585=cut
2469 2586
2470sub cf::client::ext_event($$%) { 2587sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2588 my ($self, $type, @msg) = @_;
2472 2589
2473 return unless $self->extcmd; 2590 if ($self->extcmd == 2) {
2474 2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2592 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2593 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2594 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2595 }
2596}
2597
2598=item $client->ext_reply ($msgid, @msg)
2599
2600Sends an ext reply to the client.
2601
2602=cut
2603
2604sub cf::client::ext_reply($$@) {
2605 my ($self, $id, @msg) = @_;
2606
2607 if ($self->extcmd == 2) {
2608 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2609 } elsif ($self->extcmd == 1) {
2610 #TODO: version 1, remove
2611 unshift @msg, msgtype => "reply", msgid => $id;
2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2613 }
2477} 2614}
2478 2615
2479=item $success = $client->query ($flags, "text", \&cb) 2616=item $success = $client->query ($flags, "text", \&cb)
2480 2617
2481Queues a query to the client, calling the given callback with 2618Queues a query to the client, calling the given callback with
2536 my ($ns, $buf) = @_; 2673 my ($ns, $buf) = @_;
2537 2674
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2675 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 2676
2540 if (ref $msg) { 2677 if (ref $msg) {
2678 my ($type, $reply, @payload) =
2679 "ARRAY" eq ref $msg
2680 ? @$msg
2681 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2682
2683 my @reply;
2684
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2685 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 2686 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 2687 }
2688
2689 $ns->ext_reply ($reply, @reply)
2690 if $reply;
2691
2547 } else { 2692 } else {
2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2693 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549 } 2694 }
2550 2695
2551 cf::override; 2696 cf::override;
2598our $safe = new Safe "safe"; 2743our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 2744our $safe_hole = new Safe::Hole;
2600 2745
2601$SIG{FPE} = 'IGNORE'; 2746$SIG{FPE} = 'IGNORE';
2602 2747
2603$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2748$safe->permit_only (Opcode::opset qw(
2749 :base_core :base_mem :base_orig :base_math
2750 grepstart grepwhile mapstart mapwhile
2751 sort time
2752));
2604 2753
2605# here we export the classes and methods available to script code 2754# here we export the classes and methods available to script code
2606 2755
2607=pod 2756=pod
2608 2757
2609The following functions and methods are available within a safe environment: 2758The following functions and methods are available within a safe environment:
2610 2759
2611 cf::object 2760 cf::object
2612 contr pay_amount pay_player map x y force_find force_add 2761 contr pay_amount pay_player map x y force_find force_add
2613 insert remove 2762 insert remove name archname title slaying race decrease_ob_nr
2614 2763
2615 cf::object::player 2764 cf::object::player
2616 player 2765 player
2617 2766
2618 cf::player 2767 cf::player
2623 2772
2624=cut 2773=cut
2625 2774
2626for ( 2775for (
2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race
2628 insert remove)], 2778 decrease_ob_nr)],
2629 ["cf::object::player" => qw(player)], 2779 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 2780 ["cf::player" => qw(peaceful)],
2631 ["cf::map" => qw(trigger)], 2781 ["cf::map" => qw(trigger)],
2632) { 2782) {
2633 no strict 'refs'; 2783 no strict 'refs';
2709# the server's init and main functions 2859# the server's init and main functions
2710 2860
2711sub load_facedata($) { 2861sub load_facedata($) {
2712 my ($path) = @_; 2862 my ($path) = @_;
2713 2863
2864 # HACK to clear player env face cache, we need some signal framework
2865 # for this (global event?)
2866 %ext::player_env::MUSIC_FACE_CACHE = ();
2867
2868 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2869
2714 warn "loading facedata from $path\n"; 2870 warn "loading facedata from $path\n";
2715 2871
2716 my $facedata; 2872 my $facedata;
2717 0 < aio_load $path, $facedata 2873 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 2874 or die "$path: $!";
2719 2875
2720 $facedata = Coro::Storable::thaw $facedata; 2876 $facedata = Coro::Storable::thaw $facedata;
2721 2877
2722 $facedata->{version} == 2 2878 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 2879 or cf::cleanup "$path: version mismatch, cannot proceed.";
2880
2881 # patch in the exptable
2882 $facedata->{resource}{"res/exp_table"} = {
2883 type => FT_RSRC,
2884 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2885 };
2886 cf::cede_to_tick;
2724 2887
2725 { 2888 {
2726 my $faces = $facedata->{faceinfo}; 2889 my $faces = $facedata->{faceinfo};
2727 2890
2728 while (my ($face, $info) = each %$faces) { 2891 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2892 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2730 cf::face::set_visibility $idx, $info->{visibility}; 2893 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 2894 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 2897
2735 cf::cede_to_tick; 2898 cf::cede_to_tick;
2736 } 2899 }
2737 2900
2738 while (my ($face, $info) = each %$faces) { 2901 while (my ($face, $info) = each %$faces) {
2763 2926
2764 { 2927 {
2765 # TODO: for gcfclient pleasure, we should give resources 2928 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 2929 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 2930 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical; 2931
2932 my $soundconf = delete $res->{"res/sound.conf"};
2769 2933
2770 while (my ($name, $info) = each %$res) { 2934 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2935 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2778 2937
2779 if ($name =~ /\.jpg$/) { 2938 if ($info->{type} & 1) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2939 # prepend meta info
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2940
2941 my $meta = $enc->encode ({
2942 name => $name,
2943 %{ $info->{meta} || {} },
2944 });
2945
2946 $data = pack "(w/a*)*", $meta, $info->{data};
2782 } else { 2947 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 2948 $data = $info->{data};
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 } 2949 }
2789 2950
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2790 cf::cede_to_tick; 2954 cf::cede_to_tick;
2791 } 2955 }
2956
2957 if ($soundconf) {
2958 $soundconf = $enc->decode (delete $soundconf->{data});
2959
2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2961 my $sound = $soundconf->{compat}[$_]
2962 or next;
2963
2964 my $face = cf::face::find "sound/$sound->[1]";
2965 cf::sound::set $sound->[0] => $face;
2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2967 }
2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2972 }
2973 }
2792 } 2974 }
2793 2975
2794 1 2976 1
2795} 2977}
2796 2978
2979register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_;
2981
2982 while (my ($k, $v) = each %$want) {
2983 $ns->fx_want ($k, $v);
2984 }
2985};
2986
2797sub reload_regions { 2987sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2798 load_resource_file "$MAPDIR/regions" 2992 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 2993 or die "unable to load regions file\n";
2800 2994
2801 for (cf::region::list) { 2995 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/ 2996 $_->{match} = qr/$_->{match}/
2838 3032
2839sub init { 3033sub init {
2840 reload_resources; 3034 reload_resources;
2841} 3035}
2842 3036
2843sub cfg_load { 3037sub reload_config {
2844 open my $fh, "<:utf8", "$CONFDIR/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
2845 or return; 3039 or return;
2846 3040
2847 local $/; 3041 local $/;
2848 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
2868 (async { 3062 (async {
2869 Event::one_event; 3063 Event::one_event;
2870 })->prio (Coro::PRIO_MAX); 3064 })->prio (Coro::PRIO_MAX);
2871 }; 3065 };
2872 3066
2873 cfg_load; 3067 reload_config;
2874 db_init; 3068 db_init;
2875 load_extensions; 3069 load_extensions;
2876 3070
2877 $TICK_WATCHER->start; 3071 $TICK_WATCHER->start;
2878 Event::loop; 3072 Event::loop;
3071 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
3072 require cf; 3266 require cf;
3073 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3074 3268
3075 warn "loading config and database again"; 3269 warn "loading config and database again";
3076 cf::cfg_load; 3270 cf::reload_config;
3077 3271
3078 warn "loading extensions"; 3272 warn "loading extensions";
3079 cf::load_extensions; 3273 cf::load_extensions;
3080 3274
3081 warn "reattaching attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines