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.311 by root, Fri Jul 20 16:11:10 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 ();
… …
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
274returned. 275returned.
275 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
276Lock 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
277uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
278 282
279=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
280 284
… …
320 my $guard = Coro::guard { 324 my $guard = Coro::guard {
321 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
322 }; 326 };
323 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
324 $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;
325} 385}
326 386
327=item cf::async { BLOCK } 387=item cf::async { BLOCK }
328 388
329Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
416Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
418 478
419=cut 479=cut
420 480
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 481sub fork_call(&@) {
431 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
432 483
433# 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,
434# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
436 or die "pipe: $!";
437 487
438 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 489 reset_signals;
452 local $SIG{__WARN__}; 490 &$cb
453 local $SIG{__DIE__}; 491 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 492
460 eval { 493 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 494}
473 495
474=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
475 497
476Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
556 if (1) { 578 if (1) {
557 $md5 = 579 $md5 =
558 join "\x00", 580 join "\x00",
559 $processversion, 581 $processversion,
560 map { 582 map {
561 Coro::cede; 583 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 585 } 0.. $#$src;
564 586
565 587
566 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
918 940
919=cut 941=cut
920 942
921############################################################################# 943#############################################################################
922# 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}
923 956
924sub reattach { 957sub reattach {
925 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 959 my ($obj) = @_;
927 960
… …
1114 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1115 1148
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1150
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1124 } else { 1166 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1168 }
1127 1169
1128 cf::override; 1170 cf::override;
… …
1283 1325
1284 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1286 1328
1287 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1288 Coro::cede; 1330 cf::cede_to_tick;
1289} 1331}
1290 1332
1291sub new($) { 1333sub new($) {
1292 my ($login) = @_; 1334 my ($login) = @_;
1293 1335
… …
1297 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1298 1340
1299 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1300 1342
1301 $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 (@_);
1302} 1354}
1303 1355
1304=item $pl->quit_character 1356=item $pl->quit_character
1305 1357
1306Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1450sub hintmode { 1502sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1504 $_[0]{hintmode}
1453} 1505}
1454 1506
1455=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1456 1508
1457Sends an ext reply to the player. 1509Sends an ext reply to the player.
1458 1510
1459=cut 1511=cut
1460 1512
1461sub ext_reply($$%) { 1513sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1463 1515
1464 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1517}
1467 1518
1468=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1469 1520
1470Sends an ext event to the client. 1521Sends an ext event to the client.
1471 1522
1472=cut 1523=cut
1473 1524
1474sub ext_event($$%) { 1525sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1476 1527
1477 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1478} 1529}
1479 1530
1480=head3 cf::region 1531=head3 cf::region
1481 1532
1482=over 4 1533=over 4
… …
1801 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1802 1853
1803 my $path = $self->{path}; 1854 my $path = $self->{path};
1804 1855
1805 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1806 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1807 1859
1808 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1809 1861
1810 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1811 1863
1812 $self->alloc; 1864 $self->alloc;
1813 1865
1814 $self->pre_load; 1866 $self->pre_load;
1815 Coro::cede; 1867 cf::cede_to_tick;
1816 1868
1817 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1818 or return; 1870 or return;
1819 1871
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1826 $self->clear_unique_items; 1878 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1828 } 1880 }
1829 } 1881 }
1830 1882
1831 Coro::cede; 1883 cf::cede_to_tick;
1832 # now do the right thing for maps 1884 # now do the right thing for maps
1833 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 1887 unless $self->difficulty;
1836 Coro::cede; 1888 cf::cede_to_tick;
1837 1889
1838 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 1891 $self->decay_objects;
1840 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1841 $self->update_buttons; 1893 $self->update_buttons;
1842 Coro::cede; 1894 cf::cede_to_tick;
1843 $self->set_darkness_map; 1895 $self->set_darkness_map;
1844 Coro::cede; 1896 cf::cede_to_tick;
1845 $self->activate; 1897 $self->activate;
1846 } 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1847 1902
1848 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 1904 }
1850 1905
1851 $self->post_load; 1906 $self->post_load;
… …
1862 1917
1863 $self 1918 $self
1864} 1919}
1865 1920
1866# 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
1867sub load_diag { 1922sub load_neighbours {
1868 my ($map) = @_; 1923 my ($map) = @_;
1869 1924
1870 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1871 1926
1872 for (0 .. 3) { 1927 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1874 or next; 1929 or next;
1875 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1876 or next; 1931 or next;
1877 $neigh->load; 1932 $neigh->load;
1878 1933
1934 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 1937 }
1882 1938
1883 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1885 or next; 1942 or next;
1886 $neigh->load; 1943 $neigh->load;
1887 } 1944 }
1888} 1945}
1889 1946
… …
1894} 1951}
1895 1952
1896sub do_load_sync { 1953sub do_load_sync {
1897 my ($map) = @_; 1954 my ($map) = @_;
1898 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1899 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1900} 1960}
1901 1961
1902our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1904 1964
1905sub find_async { 1965sub find_async {
1906 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1907 1967
1908 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1909 1969
1910 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 1972 }
1913 1973
1914 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1915 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1916 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 1979 if (my $map = find $k) {
1919 $map->load; 1980 $map->load if $v;
1920 } 1981 }
1921 1982
1922 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1923 } 1984 }
1924 } 1985 }
1925 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1926 }; 1987 };
1927 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1930} 1991}
1931 1992
1932sub save { 1993sub save {
1933 my ($self) = @_; 1994 my ($self) = @_;
1934 1995
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 1997
1937 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1938 1999
1939 return unless $self->dirty; 2000 return unless $self->dirty;
1940 2001
… …
1963 my ($self) = @_; 2024 my ($self) = @_;
1964 2025
1965 # save first because save cedes 2026 # save first because save cedes
1966 $self->save; 2027 $self->save;
1967 2028
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2030
1970 return if $self->players; 2031 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1973 2034
… …
2025my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2026 2087
2027sub nuke { 2088sub nuke {
2028 my ($self) = @_; 2089 my ($self) = @_;
2029 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2030 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2031 2095
2032 $self->unlink_save;
2033
2034 bless $self, "cf::map"; 2096 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2101
2102 $self->unlink_save;
2103
2040 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2041 2106
2042 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2043} 2108}
2044 2109
2045=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2152 2217
2153 } else { 2218 } else {
2154 my $pl = $self->contr; 2219 my $pl = $self->contr;
2155 2220
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2221 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2222 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2223 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2224
2165 } else { 2225 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2226 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2227 $self->message ($msg, $flags);
2168 } 2228 }
2169 } 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 (@_);
2170} 2240}
2171 2241
2172=item $player_object->may ("access") 2242=item $player_object->may ("access")
2173 2243
2174Returns wether the given player is authorized to access resource "access" 2244Returns wether the given player is authorized to access resource "access"
… …
2253 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
2256 2326
2257 $map->load; 2327 $map->load;
2258 $map->load_diag; 2328 $map->load_neighbours;
2259 2329
2260 return unless $self->contr->active; 2330 return unless $self->contr->active;
2261 $self->activate_recursive; 2331 $self->activate_recursive;
2262 2332
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2439sub cf::client::send_msg { 2509sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2510 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2511
2442 $msg = $self->pl->expand_cfpod ($msg); 2512 $msg = $self->pl->expand_cfpod ($msg);
2443 2513
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 2514 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 2515
2448 if (ref $channel) { 2516 if (ref $channel) {
2449 # send meta info to client, if not yet sent 2517 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2518 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2519 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2520 $self->ext_msg (channel_info => $channel);
2453 } 2521 }
2454 2522
2455 $channel = $channel->{id}; 2523 $channel = $channel->{id};
2456 } 2524 }
2457 2525
2526 return unless @extra || length $msg;
2527
2458 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
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2533 $self->send_packet ("msg " . $self->{json_coder}->encode (
2534 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2460 } else { 2535 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 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
2472 if (0 && $msg =~ /\[/) { 2551 if (0 && $msg =~ /\[/) {
2552 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2553 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2554 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2556 $self->send_packet ("drawinfo $color $msg")
2477 } 2557 }
2478 } 2558 }
2479 } 2559 }
2480} 2560}
2481 2561
2482=item $client->ext_event ($type, %msg) 2562=item $client->ext_msg ($type, @msg)
2483 2563
2484Sends an ext event to the client. 2564Sends an ext event to the client.
2485 2565
2486=cut 2566=cut
2487 2567
2488sub cf::client::ext_event($$%) { 2568sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2569 my ($self, $type, @msg) = @_;
2490 2570
2491 return unless $self->extcmd; 2571 if ($self->extcmd == 2) {
2492 2572 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2573 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2574 push @msg, msgtype => "event_$type";
2494 $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 }
2495} 2595}
2496 2596
2497=item $success = $client->query ($flags, "text", \&cb) 2597=item $success = $client->query ($flags, "text", \&cb)
2498 2598
2499Queues a query to the client, calling the given callback with 2599Queues a query to the client, calling the given callback with
… …
2554 my ($ns, $buf) = @_; 2654 my ($ns, $buf) = @_;
2555 2655
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2656 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 2657
2558 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
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2666 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 2667 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 2668 }
2669
2670 $ns->ext_reply ($reply, @reply)
2671 if $reply;
2672
2565 } else { 2673 } else {
2566 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";
2567 } 2675 }
2568 2676
2569 cf::override; 2677 cf::override;
… …
2616our $safe = new Safe "safe"; 2724our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 2725our $safe_hole = new Safe::Hole;
2618 2726
2619$SIG{FPE} = 'IGNORE'; 2727$SIG{FPE} = 'IGNORE';
2620 2728
2621$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));
2622 2734
2623# here we export the classes and methods available to script code 2735# here we export the classes and methods available to script code
2624 2736
2625=pod 2737=pod
2626 2738
2627The following functions and methods are available within a safe environment: 2739The following functions and methods are available within a safe environment:
2628 2740
2629 cf::object 2741 cf::object
2630 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
2631 insert remove 2743 insert remove name archname title slaying race decrease_ob_nr
2632 2744
2633 cf::object::player 2745 cf::object::player
2634 player 2746 player
2635 2747
2636 cf::player 2748 cf::player
… …
2641 2753
2642=cut 2754=cut
2643 2755
2644for ( 2756for (
2645 ["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
2646 insert remove)], 2759 decrease_ob_nr)],
2647 ["cf::object::player" => qw(player)], 2760 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 2761 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 2762 ["cf::map" => qw(trigger)],
2650) { 2763) {
2651 no strict 'refs'; 2764 no strict 'refs';
… …
2727# the server's init and main functions 2840# the server's init and main functions
2728 2841
2729sub load_facedata($) { 2842sub load_facedata($) {
2730 my ($path) = @_; 2843 my ($path) = @_;
2731 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
2732 warn "loading facedata from $path\n"; 2851 warn "loading facedata from $path\n";
2733 2852
2734 my $facedata; 2853 my $facedata;
2735 0 < aio_load $path, $facedata 2854 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 2855 or die "$path: $!";
2737 2856
2738 $facedata = Coro::Storable::thaw $facedata; 2857 $facedata = Coro::Storable::thaw $facedata;
2739 2858
2740 $facedata->{version} == 2 2859 $facedata->{version} == 2
2741 or cf::cleanup "$path: version mismatch, cannot proceed."; 2860 or cf::cleanup "$path: version mismatch, cannot proceed.";
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;
2742 2868
2743 { 2869 {
2744 my $faces = $facedata->{faceinfo}; 2870 my $faces = $facedata->{faceinfo};
2745 2871
2746 while (my ($face, $info) = each %$faces) { 2872 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2873 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2748 cf::face::set_visibility $idx, $info->{visibility}; 2874 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 2875 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2876 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2877 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 2878
2753 cf::cede_to_tick; 2879 cf::cede_to_tick;
2754 } 2880 }
2755 2881
2756 while (my ($face, $info) = each %$faces) { 2882 while (my ($face, $info) = each %$faces) {
… …
2781 2907
2782 { 2908 {
2783 # TODO: for gcfclient pleasure, we should give resources 2909 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 2910 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 2911 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical; 2912
2913 my $soundconf = delete $res->{"res/sound.conf"};
2787 2914
2788 while (my ($name, $info) = each %$res) { 2915 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2916 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2917 my $data;
2796 2918
2797 if ($name =~ /\.jpg$/) { 2919 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2920 # prepend meta info
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2921
2922 my $meta = $enc->encode ({
2923 name => $name,
2924 %{ $info->{meta} || {} },
2925 });
2926
2927 $data = pack "(w/a*)*", $meta, $info->{data};
2800 } else { 2928 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 2929 $data = $info->{data};
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 2930 }
2807 2931
2932 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2933 cf::face::set_type $idx, $info->{type};
2934
2808 cf::cede_to_tick; 2935 cf::cede_to_tick;
2809 } 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 }
2810 } 2955 }
2811 2956
2812 1 2957 1
2813} 2958}
2814 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
2815sub 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
2816 load_resource_file "$MAPDIR/regions" 2973 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 2974 or die "unable to load regions file\n";
2818 2975
2819 for (cf::region::list) { 2976 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 2977 $_->{match} = qr/$_->{match}/
… …
2856 3013
2857sub init { 3014sub init {
2858 reload_resources; 3015 reload_resources;
2859} 3016}
2860 3017
2861sub cfg_load { 3018sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3019 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3020 or return;
2864 3021
2865 local $/; 3022 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3023 *CFG = YAML::Syck::Load <$fh>;
… …
2886 (async { 3043 (async {
2887 Event::one_event; 3044 Event::one_event;
2888 })->prio (Coro::PRIO_MAX); 3045 })->prio (Coro::PRIO_MAX);
2889 }; 3046 };
2890 3047
2891 cfg_load; 3048 reload_config;
2892 db_init; 3049 db_init;
2893 load_extensions; 3050 load_extensions;
2894 3051
2895 $TICK_WATCHER->start; 3052 $TICK_WATCHER->start;
2896 Event::loop; 3053 Event::loop;
… …
3089 warn "reloading cf.pm"; 3246 warn "reloading cf.pm";
3090 require cf; 3247 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3248 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3249
3093 warn "loading config and database again"; 3250 warn "loading config and database again";
3094 cf::cfg_load; 3251 cf::reload_config;
3095 3252
3096 warn "loading extensions"; 3253 warn "loading extensions";
3097 cf::load_extensions; 3254 cf::load_extensions;
3098 3255
3099 warn "reattaching attachments to objects/players"; 3256 warn "reattaching attachments to objects/players";

Diff Legend

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