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.284 by root, Sun Jun 24 04:15:42 2007 UTC vs.
Revision 1.413 by root, Sun Apr 6 16:13:20 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.32 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
48use JSON::XS 2.01 ();
25use BDB (); 49use BDB ();
26use Data::Dumper; 50use Data::Dumper;
27use Digest::MD5; 51use Digest::MD5;
28use Fcntl; 52use Fcntl;
29use YAML::Syck (); 53use YAML ();
30use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
31use Time::HiRes; 55use Time::HiRes;
32use Compress::LZF; 56use Compress::LZF;
57use Digest::MD5 ();
33 58
34# configure various modules to our taste 59# configure various modules to our taste
35# 60#
36$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 64
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 66
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 68
49our %COMMAND = (); 69our %COMMAND = ();
50our %COMMAND_TIME = (); 70our %COMMAND_TIME = ();
51 71
52our @EXTS = (); # list of extension package names 72our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 73our %EXTCMD = ();
74our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 75our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 76our %EXT_MAP = (); # pluggable maps
56 77
57our $RELOAD; # number of reloads so far 78our $RELOAD; # number of reloads so far
58our @EVENT; 79our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
71 93
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 97our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
79 99
80our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 104our $DB_ENV;
82 105
83our %CFG; 106our %CFG;
84 107
85our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 109our $RUNTIME;
110our $NOW;
87 111
88our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
91 115
92# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 118
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
98 123
99binmode STDOUT; 124binmode STDOUT;
100binmode STDERR; 125binmode STDERR;
101 126
102# read virtual server time, if available 127# read virtual server time, if available
155 180
156The raw value load value from the last tick. 181The raw value load value from the last tick.
157 182
158=item %cf::CFG 183=item %cf::CFG
159 184
160Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 186from wherever your confdir points to.
162 187
163=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
164 189
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 191returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 192per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 193
194=item @cf::INVOKE_RESULTS
195
196This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call.
199
169=back 200=back
170 201
171=cut 202=cut
172 203
173BEGIN { 204BEGIN {
177 $msg .= "\n" 208 $msg .= "\n"
178 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
179 210
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 212
182 utf8::encode $msg;
183 LOG llevError, $msg; 213 LOG llevError, $msg;
184 }; 214 };
185} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
186 231
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
203)) { 248)) {
204 no strict 'refs'; 249 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 251}
207 252
208$Event::DIED = sub { 253$EV::DIED = sub {
209 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
210}; 255};
211 256
212############################################################################# 257#############################################################################
213 258
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 282 $d
238 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
239} 284}
240 285
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
244 287
245Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
246 289
247=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
248 291
249Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
293
294=cut
295
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297
298sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) }
250 300
251=item cf::lock_wait $string 301=item cf::lock_wait $string
252 302
253Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
254 304
257Wait until the given lock is available and then acquires it and returns 307Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
260returned. 310returned.
261 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
262Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
264 317
265=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
266 319
267Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
268 321
269=cut 322=cut
270 323
271our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
272 326
273sub lock_wait($) { 327sub lock_wait($) {
274 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
275 334
276 # wait for lock, if any 335 # wait for lock, if any
277 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 338 Coro::schedule;
285 344
286 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
287 lock_wait $key; 346 lock_wait $key;
288 347
289 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
290 350
291 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
294 } 355 }
295} 356}
296 357
299 360
300 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
301} 362}
302 363
303sub freeze_mainloop { 364sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
305 366
306 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
307 $TICK_WATCHER->start; 368}
369
370=item cf::periodic $interval, $cb
371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
383}
384
385=item cf::get_slot $time[, $priority[, $name]]
386
387Allocate $time seconds of blocking CPU time at priority C<$priority>:
388This call blocks and returns only when you have at least C<$time> seconds
389of cpu time till the next tick. The slot is only valid till the next cede.
390
391The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class.
393
394Useful for short background jobs.
395
396=cut
397
398our @SLOT_QUEUE;
399our $SLOT_QUEUE;
400
401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
405 my $signal = new Coro::Signal;
406
407 while () {
408 next_job:
409 my $avail = cf::till_tick;
410 if ($avail > 0.01) {
411 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) {
413 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send;
415 Coro::cede;
416 goto next_job;
417 }
418 }
419 }
420
421 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else {
426 Coro::schedule;
427 }
308 }; 428 }
309 $TICK_WATCHER->stop; 429};
310 $guard 430
431sub get_slot($;$$) {
432 my ($time, $pri, $name) = @_;
433
434 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal;
436
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready;
440 $sig->wait;
311} 441}
312 442
313=item cf::async { BLOCK } 443=item cf::async { BLOCK }
314 444
315Currently the same as Coro::async_pool, meaning you cannot use 445Currently the same as Coro::async_pool, meaning you cannot use
320 450
321BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
322 452
323=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
324 454
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 458acceptable.
329 459
330If it must be done, put the blocking parts into C<sync_job>. This will run 460If it must be done, put the blocking parts into C<sync_job>. This will run
331the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
336 466
337sub sync_job(&) { 467sub sync_job(&) {
338 my ($job) = @_; 468 my ($job) = @_;
339 469
340 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 471 my $time = EV::time;
342 472
343 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
345 475
346 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 477
348 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
349 479
350 my $busy = 1; 480 my $busy = 1;
351 my @res; 481 my @res;
352 482
353 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 485 @res = eval { $job->() };
355 warn $@ if $@; 486 warn $@ if $@;
356 undef $busy; 487 undef $busy;
357 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
358 489
359 while ($busy) { 490 while ($busy) {
360 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
361 } 495 }
496 }
362 497
363 $time = Event::time - $time; 498 my $time = EV::time - $time;
364 499
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
369 501
370 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
371 } else { 503 } else {
372 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
373 505
398=item fork_call { }, $args 530=item fork_call { }, $args
399 531
400Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
404 536
405=cut 537=cut
406 538
407sub fork_call(&@) { 539sub fork_call(&@) {
408 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
409 541
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 542 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 545
415 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 547 reset_signals;
428 local $SIG{__WARN__}; 548 &$cb
429 local $SIG{__DIE__}; 549 }, @args;
430 eval {
431 close $fh1;
432 550
433 my @res = eval { $cb->(@args) }; 551 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 }
440} 552}
441 553
442=item $value = cf::db_get $family => $key 554=item $value = cf::db_get $family => $key
443 555
444Returns a single value from the environment database. 556Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 558=item cf::db_put $family => $key => $value
447 559
448Stores the given C<$value> in the family. It can currently store binary 560Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 561data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 562
563=item $db = cf::db_table "name"
564
565Create and/or open a new database table. The string must not be "db" and must be unique
566within each server.
567
451=cut 568=cut
569
570sub db_table($) {
571 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV;
573
574 eval {
575 $db->set_flags (BDB::CHKSUM);
576
577 utf8::encode $name;
578 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
579 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
580 cf::cleanup "db_open(db): $!" if $!;
581 };
582 cf::cleanup "db_open(db): $@" if $@;
583
584 $db
585}
452 586
453our $DB; 587our $DB;
454 588
455sub db_init { 589sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 590 cf::sync_job {
460 eval { 591 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 592 };
470} 593}
471 594
472sub db_get($$) { 595sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 596 my $key = "$_[0]/$_[1]";
474 597
524 if (1) { 647 if (1) {
525 $md5 = 648 $md5 =
526 join "\x00", 649 join "\x00",
527 $processversion, 650 $processversion,
528 map { 651 map {
529 Coro::cede; 652 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 653 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 654 } 0.. $#$src;
532 655
533 656
534 my $dbmd5 = db_get cache => "$id/md5"; 657 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
580 703
581In the following description, CLASS can be any of C<global>, C<object> 704In the following description, CLASS can be any of C<global>, C<object>
582C<player>, C<client> or C<map> (i.e. the attachable objects in 705C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 706Deliantra).
584 707
585=over 4 708=over 4
586 709
587=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
588 711
840 "; 963 ";
841 die if $@; 964 die if $@;
842} 965}
843 966
844our $override; 967our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 968our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 969
847sub override { 970sub override {
848 $override = 1; 971 $override = 1;
849 @invoke_results = (); 972 @INVOKE_RESULTS = (@_);
850} 973}
851 974
852sub do_invoke { 975sub do_invoke {
853 my $event = shift; 976 my $event = shift;
854 my $callbacks = shift; 977 my $callbacks = shift;
855 978
856 @invoke_results = (); 979 @INVOKE_RESULTS = ();
857 980
858 local $override; 981 local $override;
859 982
860 for (@$callbacks) { 983 for (@$callbacks) {
861 eval { &{$_->[1]} }; 984 eval { &{$_->[1]} };
870 } 993 }
871 994
872 0 995 0
873} 996}
874 997
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 999
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1001
879Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
880 1003
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1004This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 1005removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 1006results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1007
885=back 1008=back
886 1009
887=cut 1010=cut
888 1011
889############################################################################# 1012#############################################################################
890# object support 1013# object support
1014
1015sub _object_equal($$);
1016sub _object_equal($$) {
1017 my ($a, $b) = @_;
1018
1019 return 0 unless (ref $a) eq (ref $b);
1020
1021 if ("HASH" eq ref $a) {
1022 my @ka = keys %$a;
1023 my @kb = keys %$b;
1024
1025 return 0 if @ka != @kb;
1026
1027 for (0 .. $#ka) {
1028 return 0 unless $ka[$_] eq $kb[$_];
1029 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1030 }
1031
1032 } elsif ("ARRAY" eq ref $a) {
1033
1034 return 0 if @$a != @$b;
1035
1036 for (0 .. $#$a) {
1037 return 0 unless _object_equal $a->[$_], $b->[$_];
1038 }
1039
1040 } elsif ($a ne $b) {
1041 return 0;
1042 }
1043
1044 1
1045}
1046
1047our $SLOW_MERGES;#d#
1048sub _can_merge {
1049 my ($ob1, $ob2) = @_;
1050
1051 ++$SLOW_MERGES;#d#
1052
1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
1055}
891 1056
892sub reattach { 1057sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1059 my ($obj) = @_;
895 1060
916cf::attachable->attach ( 1081cf::attachable->attach (
917 prio => -1000000, 1082 prio => -1000000,
918 on_instantiate => sub { 1083 on_instantiate => sub {
919 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
920 1085
921 $data = from_json $data; 1086 $data = decode_json $data;
922 1087
923 for (@$data) { 1088 for (@$data) {
924 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
925 1090
926 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1107sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
944 1109
945 sync_job { 1110 sync_job {
946 if (length $$rdata) { 1111 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1114 $decname, length $$rdata, scalar @$objs;
949 1115
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1117 chmod SAVE_MODE, $fh;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1119 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1120 close $fh;
955 1121
956 if (@$objs) { 1122 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1128 close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
964 } 1130 }
972 } 1138 }
973 } else { 1139 } else {
974 aio_unlink $filename; 1140 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
976 } 1142 }
977 } 1143 };
978} 1144}
979 1145
980sub object_freezer_as_string { 1146sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
982 1148
994 or return; 1160 or return;
995 1161
996 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
998 or return; 1164 or return;
1165
999 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1000 } 1168 }
1001 1169
1170 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1173
1004 return ($data, $av); 1174 ($data, $av)
1005} 1175}
1006 1176
1007=head2 COMMAND CALLBACKS 1177=head2 COMMAND CALLBACKS
1008 1178
1009=over 4 1179=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1199 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1200}
1031 1201
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1202=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1203
1034Register a callback fro execution when the client sends an extcmd packet. 1204Register a callback for execution when the client sends an (synchronous)
1205extcmd packet. Ext commands will be processed in the order they are
1206received by the server, like other user commands. The first argument is
1207the logged-in player. Ext commands can only be processed after a player
1208has logged in successfully.
1035 1209
1036If the callback returns something, it is sent back as if reply was being 1210If the callback returns something, it is sent back as if reply was being
1037called. 1211called.
1038 1212
1213=item cf::register_exticmd $name => \&callback($ns,$packet);
1214
1215Register a callback for execution when the client sends an (asynchronous)
1216exticmd packet. Exti commands are processed by the server as soon as they
1217are received, i.e. out of order w.r.t. other commands. The first argument
1218is a client socket. Exti commands can be received anytime, even before
1219log-in.
1220
1221If the callback returns something, it is sent back as if reply was being
1222called.
1223
1039=cut 1224=cut
1040 1225
1041sub register_extcmd { 1226sub register_extcmd {
1042 my ($name, $cb) = @_; 1227 my ($name, $cb) = @_;
1043 1228
1044 $EXTCMD{$name} = $cb; 1229 $EXTCMD{$name} = $cb;
1230}
1231
1232sub register_exticmd {
1233 my ($name, $cb) = @_;
1234
1235 $EXTICMD{$name} = $cb;
1045} 1236}
1046 1237
1047cf::player->attach ( 1238cf::player->attach (
1048 on_command => sub { 1239 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1240 my ($pl, $name, $params) = @_;
1058 cf::override; 1249 cf::override;
1059 }, 1250 },
1060 on_extcmd => sub { 1251 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1252 my ($pl, $buf) = @_;
1062 1253
1063 my $msg = eval { from_json $buf }; 1254 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1255
1065 if (ref $msg) { 1256 if (ref $msg) {
1257 my ($type, $reply, @payload) =
1258 "ARRAY" eq ref $msg
1259 ? @$msg
1260 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1261
1262 my @reply;
1263
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1264 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1265 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1266 }
1267
1268 $pl->ext_reply ($reply, @reply)
1269 if $reply;
1270
1071 } else { 1271 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1273 }
1074 1274
1075 cf::override; 1275 cf::override;
1128 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1130 1330
1131 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1332 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1334 }
1136 1335
1137 warn $msg; 1336 warn $msg;
1138 } 1337 }
1139 1338
1164use Coro::AIO; 1363use Coro::AIO;
1165 1364
1166=head3 cf::player 1365=head3 cf::player
1167 1366
1168=over 4 1367=over 4
1368
1369=item cf::player::num_playing
1370
1371Returns the official number of playing players, as per the Crossfire metaserver rules.
1372
1373=cut
1374
1375sub num_playing {
1376 scalar grep
1377 $_->ob->map
1378 && !$_->hidden
1379 && !$_->ob->flag (cf::FLAG_WIZ),
1380 cf::player::list
1381}
1169 1382
1170=item cf::player::find $login 1383=item cf::player::find $login
1171 1384
1172Returns the given player object, loading it if necessary (might block). 1385Returns the given player object, loading it if necessary (might block).
1173 1386
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1422 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1423 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1424 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1426
1214 my $pl = load_pl path $login 1427 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1428 or return;
1429
1430 my $pl = cf::player::load_pl $f
1431 or return;
1432 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1217 } 1435 }
1218 } 1436 }
1219} 1437}
1220 1438
1230 1448
1231 aio_mkdir playerdir $pl, 0770; 1449 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1450 $pl->{last_save} = $cf::RUNTIME;
1233 1451
1234 $pl->save_pl ($path); 1452 $pl->save_pl ($path);
1235 Coro::cede; 1453 cf::cede_to_tick;
1236} 1454}
1237 1455
1238sub new($) { 1456sub new($) {
1239 my ($login) = @_; 1457 my ($login) = @_;
1240 1458
1244 $self->{deny_save} = 1; 1462 $self->{deny_save} = 1;
1245 1463
1246 $cf::PLAYER{$login} = $self; 1464 $cf::PLAYER{$login} = $self;
1247 1465
1248 $self 1466 $self
1467}
1468
1469=item $player->send_msg ($channel, $msg, $color, [extra...])
1470
1471=cut
1472
1473sub send_msg {
1474 my $ns = shift->ns
1475 or return;
1476 $ns->send_msg (@_);
1249} 1477}
1250 1478
1251=item $pl->quit_character 1479=item $pl->quit_character
1252 1480
1253Nukes the player without looking back. If logged in, the connection will 1481Nukes the player without looking back. If logged in, the connection will
1308 or return []; 1536 or return [];
1309 1537
1310 my @logins; 1538 my @logins;
1311 1539
1312 for my $login (@$dirs) { 1540 for my $login (@$dirs) {
1541 my $path = path $login;
1542
1543 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1546 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1547 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 }
1316 1549
1317 utf8::decode $login; 1550 utf8::decode $login;
1318 push @logins, $login; 1551 push @logins, $login;
1319 } 1552 }
1320 1553
1353 1586
1354Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1355 1588
1356=cut 1589=cut
1357 1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1358sub expand_cfpod { 1602sub expand_cfpod {
1359 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1360 1604
1361 # escape & and < 1605 my $xml;
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364 1606
1365 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1366 1610
1367 1 while 1611 $group =~ s/&/&amp;/g;
1368 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1369 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1370 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1371 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1372 # replace G<male|female> tags 1616 ([BCGHITU])
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1617 <
1374 $self->gender ? $2 : $1 1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1375 }ge 1654 }
1376 # replace H<hint text> 1655 }
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378 1656
1657 for ($xml) {
1379 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1381 1660
1382 $_ 1661 # compress some whitespace
1383} 1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1384 1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677
1385=item $player->ext_reply ($msgid, %msg) 1678=item $player->ext_reply ($msgid, @msg)
1386 1679
1387Sends an ext reply to the player. 1680Sends an ext reply to the player.
1388 1681
1389=cut 1682=cut
1390 1683
1391sub ext_reply($$%) { 1684sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1685 my ($self, $id, @msg) = @_;
1393 1686
1394 $msg{msgid} = $id; 1687 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1688}
1398 1689
1399=item $player->ext_event ($type, %msg) 1690=item $player->ext_msg ($type, @msg)
1400 1691
1401Sends an ext event to the client. 1692Sends an ext event to the client.
1402 1693
1403=cut 1694=cut
1404 1695
1405sub ext_event($$%) { 1696sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1697 my ($self, $type, @msg) = @_;
1407 1698
1408 $self->ns->ext_event ($type, %msg); 1699 $self->ns->ext_msg ($type, @msg);
1409} 1700}
1410 1701
1411=head3 cf::region 1702=head3 cf::region
1412 1703
1413=over 4 1704=over 4
1426 my ($path) = @_; 1717 my ($path) = @_;
1427 1718
1428 my ($match, $specificity); 1719 my ($match, $specificity);
1429 1720
1430 for my $region (list) { 1721 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1722 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1723 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1724 if $region->specificity > $specificity;
1434 } 1725 }
1435 } 1726 }
1436 1727
1556 $self->init; # pass $1 etc. 1847 $self->init; # pass $1 etc.
1557 return $self; 1848 return $self;
1558 } 1849 }
1559 } 1850 }
1560 1851
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1852 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1853 ()
1563} 1854}
1564 1855
1565sub init { 1856sub init {
1566 my ($self) = @_; 1857 my ($self) = @_;
1629 1920
1630sub load_header_from($) { 1921sub load_header_from($) {
1631 my ($self, $path) = @_; 1922 my ($self, $path) = @_;
1632 1923
1633 utf8::encode $path; 1924 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1925 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 or return; 1926 or return;
1927
1928 $self->_load_header ($f)
1929 or return;
1930
1931 local $MAP_LOADING{$self->{path}} = $self;
1932 $f->resolve_delayed_derefs;
1639 1933
1640 $self->{load_path} = $path; 1934 $self->{load_path} = $path;
1641 1935
1642 1 1936 1
1643} 1937}
1697sub find { 1991sub find {
1698 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1699 1993
1700 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1701 1995
1996 cf::lock_wait "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 1997 cf::lock_wait "map_find:$path";
1703 1998
1704 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1705 my $guard = cf::lock_acquire "map_find:$path"; 2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
1706 my $map = new_from_path cf::map $path 2003 my $map = new_from_path cf::map $path
1707 or return; 2004 or return;
1708 2005
1709 $map->{last_save} = $cf::RUNTIME; 2006 $map->{last_save} = $cf::RUNTIME;
1710 2007
1712 or return; 2009 or return;
1713 2010
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 2012 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 2013 #$cf::WAIT_FOR_TICK->wait;
2014 undef $guard1;
2015 undef $guard2;
1717 $map->reset; 2016 $map->reset;
1718 undef $guard;
1719 return find $path; 2017 return find $path;
1720 } 2018 }
1721 2019
1722 $cf::MAP{$path} = $map 2020 $cf::MAP{$path} = $map
1723 } 2021 }
1732 local $self->{deny_reset} = 1; # loading can take a long time 2030 local $self->{deny_reset} = 1; # loading can take a long time
1733 2031
1734 my $path = $self->{path}; 2032 my $path = $self->{path};
1735 2033
1736 { 2034 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2035 my $guard = cf::lock_acquire "map_data:$path";
1738 2036
2037 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2038 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2039
1741 $self->in_memory (cf::MAP_LOADING); 2040 $self->in_memory (cf::MAP_LOADING);
1742 2041
1743 $self->alloc; 2042 $self->alloc;
1744 2043
1745 $self->pre_load; 2044 $self->pre_load;
1746 Coro::cede; 2045 cf::cede_to_tick;
1747 2046
2047 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2049 $self->_load_objects ($f)
1749 or return; 2050 or return;
1750 2051
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752 if delete $self->{load_original}; 2053 if delete $self->{load_original};
1753 2054
1754 if (my $uniq = $self->uniq_path) { 2055 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2056 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2057 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2059 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2060 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs;
2062 }
1759 } 2063 }
1760 } 2064 }
1761 2065
1762 Coro::cede; 2066 $f->resolve_delayed_derefs;
2067
2068 cf::cede_to_tick;
1763 # now do the right thing for maps 2069 # now do the right thing for maps
1764 $self->link_multipart_objects; 2070 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2071 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2072 unless $self->difficulty;
1767 Coro::cede; 2073 cf::cede_to_tick;
1768 2074
1769 unless ($self->{deny_activate}) { 2075 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2076 $self->decay_objects;
1771 $self->fix_auto_apply; 2077 $self->fix_auto_apply;
1772 $self->update_buttons; 2078 $self->update_buttons;
1773 Coro::cede; 2079 cf::cede_to_tick;
1774 $self->set_darkness_map; 2080 $self->set_darkness_map;
1775 Coro::cede; 2081 cf::cede_to_tick;
1776 $self->activate; 2082 $self->activate;
1777 } 2083 }
2084
2085 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME);
1778 2087
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2088 $self->in_memory (cf::MAP_IN_MEMORY);
1780 } 2089 }
1781 2090
1782 $self->post_load; 2091 $self->post_load;
1793 2102
1794 $self 2103 $self
1795} 2104}
1796 2105
1797# find and load all maps in the 3x3 area around a map 2106# find and load all maps in the 3x3 area around a map
1798sub load_diag { 2107sub load_neighbours {
1799 my ($map) = @_; 2108 my ($map) = @_;
1800 2109
1801 my @diag; # diagonal neighbours 2110 my @neigh; # diagonal neighbours
1802 2111
1803 for (0 .. 3) { 2112 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2113 my $neigh = $map->tile_path ($_)
1805 or next; 2114 or next;
1806 $neigh = find $neigh, $map 2115 $neigh = find $neigh, $map
1807 or next; 2116 or next;
1808 $neigh->load; 2117 $neigh->load;
1809 2118
2119 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2122 }
1813 2123
1814 for (@diag) { 2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2126 my $neigh = find $path, $origin
1816 or next; 2127 or next;
1817 $neigh->load; 2128 $neigh->load;
1818 } 2129 }
1819} 2130}
1820 2131
1825} 2136}
1826 2137
1827sub do_load_sync { 2138sub do_load_sync {
1828 my ($map) = @_; 2139 my ($map) = @_;
1829 2140
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main;
2143
1830 cf::sync_job { $map->load }; 2144 cf::sync_job { $map->load };
1831} 2145}
1832 2146
1833our %MAP_PREFETCH; 2147our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2148our $MAP_PREFETCHER = undef;
1835 2149
1836sub find_async { 2150sub find_async {
1837 my ($path, $origin) = @_; 2151 my ($path, $origin, $load) = @_;
1838 2152
1839 $path = normalise $path, $origin && $origin->{path}; 2153 $path = normalise $path, $origin && $origin->{path};
1840 2154
1841 if (my $map = $cf::MAP{$path}) { 2155 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843 } 2157 }
1844 2158
1845 undef $MAP_PREFETCH{$path}; 2159 $MAP_PREFETCH{$path} |= $load;
2160
1846 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
1847 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2166 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2167 $map->load if $v;
2168 }
1852 2169
1853 delete $MAP_PREFETCH{$path}; 2170 delete $MAP_PREFETCH{$k};
1854 } 2171 }
1855 } 2172 }
1856 undef $MAP_PREFETCHER; 2173 undef $MAP_PREFETCHER;
1857 }; 2174 };
1858 $MAP_PREFETCHER->prio (6); 2175 $MAP_PREFETCHER->prio (6);
1861} 2178}
1862 2179
1863sub save { 2180sub save {
1864 my ($self) = @_; 2181 my ($self) = @_;
1865 2182
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2184
1868 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
1869 2186
1870 return unless $self->dirty; 2187 return unless $self->dirty;
1871 2188
1877 return if $self->{deny_save}; 2194 return if $self->{deny_save};
1878 2195
1879 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
1880 2197
1881 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
1883 }; 2201 };
1884 2202
1885 if ($uniq) { 2203 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1894 my ($self) = @_; 2212 my ($self) = @_;
1895 2213
1896 # save first because save cedes 2214 # save first because save cedes
1897 $self->save; 2215 $self->save;
1898 2216
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2218
1901 return if $self->players; 2219 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
1903 return if $self->{deny_save}; 2221 return if $self->{deny_save};
1904 2222
2223 $self->in_memory (cf::MAP_SWAPPED);
2224
2225 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2227 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2228}
1908 2229
1909sub reset_at { 2230sub reset_at {
1910 my ($self) = @_; 2231 my ($self) = @_;
1911 2232
1943 if $uniq; 2264 if $uniq;
1944 } 2265 }
1945 2266
1946 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
1947 2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2271 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2272
1952 $self->unlink_save; 2273 $self->unlink_save;
1953 $self->destroy; 2274 $self->destroy;
1954} 2275}
1955 2276
1956my $nuke_counter = "aaaa"; 2277my $nuke_counter = "aaaa";
1957 2278
1958sub nuke { 2279sub nuke {
1959 my ($self) = @_; 2280 my ($self) = @_;
1960 2281
2282 {
2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284
1961 delete $cf::MAP{$self->path}; 2285 delete $cf::MAP{$self->path};
1962 2286
1963 $self->unlink_save; 2287 $self->unlink_save;
1964 2288
1965 bless $self, "cf::map"; 2289 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2290 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2291 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2292 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2294
1971 $cf::MAP{$self->path} = $self; 2295 $cf::MAP{$self->path} = $self;
2296 }
1972 2297
1973 $self->reset; # polite request, might not happen 2298 $self->reset; # polite request, might not happen
1974} 2299}
1975 2300
1976=item $maps = cf::map::tmp_maps 2301=item $maps = cf::map::tmp_maps
2052 2377
2053sub inv_recursive { 2378sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2379 inv_recursive_ inv $_[0]
2055} 2380}
2056 2381
2382=item $ref = $ob->ref
2383
2384creates and returns a persistent reference to an objetc that can be stored as a string.
2385
2386=item $ob = cf::object::deref ($refstring)
2387
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block.
2390
2391=cut
2392
2393sub deref {
2394 my ($ref) = @_;
2395
2396 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2397 my ($uuid, $name) = ($1, $2);
2398 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2399 or return;
2400 $pl->ob->uuid eq $uuid
2401 or return;
2402
2403 $pl->ob
2404 } else {
2405 warn "$ref: cannot resolve object reference\n";
2406 undef
2407 }
2408}
2409
2057package cf; 2410package cf;
2058 2411
2059=back 2412=back
2060 2413
2061=head3 cf::object::player 2414=head3 cf::object::player
2083 2436
2084 } else { 2437 } else {
2085 my $pl = $self->contr; 2438 my $pl = $self->contr;
2086 2439
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2440 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2443
2096 } else { 2444 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2446 $self->message ($msg, $flags);
2099 } 2447 }
2100 } 2448 }
2449}
2450
2451=item $object->send_msg ($channel, $msg, $color, [extra...])
2452
2453=cut
2454
2455sub cf::object::send_msg {
2456 my $pl = shift->contr
2457 or return;
2458 $pl->send_msg (@_);
2101} 2459}
2102 2460
2103=item $player_object->may ("access") 2461=item $player_object->may ("access")
2104 2462
2105Returns wether the given player is authorized to access resource "access" 2463Returns wether the given player is authorized to access resource "access"
2184 # use -1 or undef as default coordinates, not 0, 0 2542 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2543 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2544 if $x <=0 && $y <= 0;
2187 2545
2188 $map->load; 2546 $map->load;
2189 $map->load_diag; 2547 $map->load_neighbours;
2190 2548
2191 return unless $self->contr->active; 2549 return unless $self->contr->active;
2192 $self->activate_recursive; 2550 $self->activate_recursive;
2193 2551
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2553 $self->enter_map ($map, $x, $y);
2196} 2554}
2197 2555
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2557
2200Moves the player to the given map-path and coordinates by first freezing 2558Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2559her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2560that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2561the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process.
2204 2563
2205=cut 2564=cut
2206 2565
2207our $GOTOGEN; 2566our $GOTOGEN;
2208 2567
2209sub cf::object::player::goto { 2568sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2569 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2570
2212 # do generation counting so two concurrent goto's will be executed in-order 2571 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2573
2215 $self->enter_link; 2574 $self->enter_link;
2216 2575
2217 (async { 2576 (async {
2577 $Coro::current->{desc} = "player::goto $path $x $y";
2578
2579 # *tag paths override both path and x|y
2580 if ($path =~ /^\*(.*)$/) {
2581 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2582 my $ob = $obs[rand @obs];
2583
2584 # see if we actually can go there
2585 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2586 $ob = $obs[rand @obs];
2587 } else {
2588 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 }
2590 # else put us there anyways for now #d#
2591
2592 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2593 } else {
2594 ($path, $x, $y) = (undef, undef, undef);
2595 }
2596 }
2597
2218 my $map = eval { 2598 my $map = eval {
2219 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2220 2600
2221 if ($map) { 2601 if ($map) {
2222 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2224 } else { 2604 } else {
2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226 } 2606 }
2227 2607
2228 $map 2608 $map
2229 }; 2609 };
2230 2610
2235 2615
2236 if ($gen == $self->{_goto_generation}) { 2616 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2617 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2618 $self->leave_link ($map, $x, $y);
2239 } 2619 }
2620
2621 $done->() if $done;
2240 })->prio (1); 2622 })->prio (1);
2241} 2623}
2242 2624
2243=item $player_object->enter_exit ($exit_object) 2625=item $player_object->enter_exit ($exit_object)
2244 2626
2281 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2282 } 2664 }
2283 2665
2284 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2285 2667
2286 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2287 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2289 2671
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2313 my $hp = $exit->stats->hp; 2695 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2696 my $sp = $exit->stats->sp;
2315 2697
2316 $self->enter_link; 2698 $self->enter_link;
2317 2699
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2318 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2319 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2708 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2322 2710
2323 1; 2711 1;
2349 2737
2350 utf8::encode $text; 2738 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2740}
2353 2741
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2742=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2743
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2744Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2745client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2360 2748
2361=cut 2749=cut
2362 2750
2751# non-persistent channels (usually the info channel)
2752our %CHANNEL = (
2753 "c/identify" => {
2754 id => "infobox",
2755 title => "Identify",
2756 reply => undef,
2757 tooltip => "Items recently identified",
2758 },
2759 "c/examine" => {
2760 id => "infobox",
2761 title => "Examine",
2762 reply => undef,
2763 tooltip => "Signs and other items you examined",
2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801);
2802
2363sub cf::client::send_msg { 2803sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2805
2366 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2367 2807
2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809
2810 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2819 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2825 }
2826
2827 $channel = $channel->{id};
2828 }
2829
2830 return unless @extra || length $msg;
2831
2368 if ($self->can_msg) { 2832 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2833 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF;
2836
2837 $self->send_packet ("msg " . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370 } else { 2839 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/;
2379 }
2380
2381 if ($color >= 0) { 2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850
2851 $color &= cf::NDI_COLOR_MASK;
2852
2853 utf8::encode $msg;
2854
2382 if (0 && $msg =~ /\[/) { 2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2858 } else {
2385 s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg") 2860 $self->send_packet ("drawinfo $color $msg")
2387 } 2861 }
2388 } 2862 }
2389 } 2863 }
2390} 2864}
2391 2865
2392=item $client->ext_event ($type, %msg) 2866=item $client->ext_msg ($type, @msg)
2393 2867
2394Sends an exti event to the client. 2868Sends an ext event to the client.
2395 2869
2396=cut 2870=cut
2397 2871
2398sub cf::client::ext_event($$%) { 2872sub cf::client::ext_msg($$@) {
2399 my ($self, $type, %msg) = @_; 2873 my ($self, $type, @msg) = @_;
2400 2874
2875 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove
2401 $msg{msgtype} = "event_$type"; 2878 push @msg, msgtype => "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 }
2881}
2882
2883=item $client->ext_reply ($msgid, @msg)
2884
2885Sends an ext reply to the client.
2886
2887=cut
2888
2889sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_;
2891
2892 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 }
2403} 2899}
2404 2900
2405=item $success = $client->query ($flags, "text", \&cb) 2901=item $success = $client->query ($flags, "text", \&cb)
2406 2902
2407Queues a query to the client, calling the given callback with 2903Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2904the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2905C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2906
2411Queries can fail, so check the return code. Or don't, as queries will become 2907Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2908become reliable at some point in the future.
2413 2909
2414=cut 2910=cut
2415 2911
2416sub cf::client::query { 2912sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2913 my ($self, $flags, $text, $cb) = @_;
2425 utf8::encode $text; 2921 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2922 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2923
2428 $self->send_packet ($self->{query_queue}[0][0]) 2924 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2925 if @{ $self->{query_queue} } == 1;
2926
2927 1
2430} 2928}
2431 2929
2432cf::client->attach ( 2930cf::client->attach (
2931 on_connect => sub {
2932 my ($ns) = @_;
2933
2934 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2935 },
2433 on_reply => sub { 2936 on_reply => sub {
2434 my ($ns, $msg) = @_; 2937 my ($ns, $msg) = @_;
2435 2938
2436 # this weird shuffling is so that direct followup queries 2939 # this weird shuffling is so that direct followup queries
2437 # get handled first 2940 # get handled first
2449 } else { 2952 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2953 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2954 }
2452 } 2955 }
2453 }, 2956 },
2957 on_exticmd => sub {
2958 my ($ns, $buf) = @_;
2959
2960 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2961
2962 if (ref $msg) {
2963 my ($type, $reply, @payload) =
2964 "ARRAY" eq ref $msg
2965 ? @$msg
2966 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2967
2968 my @reply;
2969
2970 if (my $cb = $EXTICMD{$type}) {
2971 @reply = $cb->($ns, @payload);
2972 }
2973
2974 $ns->ext_reply ($reply, @reply)
2975 if $reply;
2976
2977 } else {
2978 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2979 }
2980
2981 cf::override;
2982 },
2454); 2983);
2455 2984
2456=item $client->async (\&cb) 2985=item $client->async (\&cb)
2457 2986
2458Create a new coroutine, running the specified callback. The coroutine will 2987Create a new coroutine, running the specified callback. The coroutine will
2499our $safe = new Safe "safe"; 3028our $safe = new Safe "safe";
2500our $safe_hole = new Safe::Hole; 3029our $safe_hole = new Safe::Hole;
2501 3030
2502$SIG{FPE} = 'IGNORE'; 3031$SIG{FPE} = 'IGNORE';
2503 3032
2504$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3033$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math
3035 grepstart grepwhile mapstart mapwhile
3036 sort time
3037));
2505 3038
2506# here we export the classes and methods available to script code 3039# here we export the classes and methods available to script code
2507 3040
2508=pod 3041=pod
2509 3042
2510The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2511 3044
2512 cf::object contr pay_amount pay_player map 3045 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr
3048
2513 cf::object::player player 3049 cf::object::player
2514 cf::player peaceful 3050 player
2515 cf::map trigger 3051
3052 cf::player
3053 peaceful
3054
3055 cf::map
3056 trigger
2516 3057
2517=cut 3058=cut
2518 3059
2519for ( 3060for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race
3063 decrease_ob_nr destroy)],
2521 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2523 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2524) { 3067) {
2525 no strict 'refs'; 3068 no strict 'refs';
2601# the server's init and main functions 3144# the server's init and main functions
2602 3145
2603sub load_facedata($) { 3146sub load_facedata($) {
2604 my ($path) = @_; 3147 my ($path) = @_;
2605 3148
3149 # HACK to clear player env face cache, we need some signal framework
3150 # for this (global event?)
3151 %ext::player_env::MUSIC_FACE_CACHE = ();
3152
3153 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3154
2606 warn "loading facedata from $path\n"; 3155 warn "loading facedata from $path\n";
2607 3156
2608 my $facedata; 3157 my $facedata;
2609 0 < aio_load $path, $facedata 3158 0 < aio_load $path, $facedata
2610 or die "$path: $!"; 3159 or die "$path: $!";
2612 $facedata = Coro::Storable::thaw $facedata; 3161 $facedata = Coro::Storable::thaw $facedata;
2613 3162
2614 $facedata->{version} == 2 3163 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed."; 3164 or cf::cleanup "$path: version mismatch, cannot proceed.";
2616 3165
3166 # patch in the exptable
3167 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3170 };
3171 cf::cede_to_tick;
3172
2617 { 3173 {
2618 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2619 3175
2620 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3179 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625 Coro::cede; 3183
3184 cf::cede_to_tick;
2626 } 3185 }
2627 3186
2628 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2630 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2631 or next; 3191 or next;
3192
2632 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
3194 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 3196 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 3198 }
2637 Coro::cede; 3199
3200 cf::cede_to_tick;
2638 } 3201 }
2639 } 3202 }
2640 3203
2641 { 3204 {
2642 my $anims = $facedata->{animinfo}; 3205 my $anims = $facedata->{animinfo};
2643 3206
2644 while (my ($anim, $info) = each %$anims) { 3207 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3208 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 3209 cf::cede_to_tick;
2647 } 3210 }
2648 3211
2649 cf::anim::invalidate_all; # d'oh 3212 cf::anim::invalidate_all; # d'oh
2650 } 3213 }
2651 3214
3215 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource};
3219
3220 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) {
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224
3225 if ($info->{type} & 1) {
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type};
3240 } else {
3241 $RESOURCE{$name} = $info;
3242 }
3243
3244 cf::cede_to_tick;
3245 }
3246 }
3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249
2652 1 3250 1
2653} 3251}
2654 3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3272
3273register_exticmd fx_want => sub {
3274 my ($ns, $want) = @_;
3275
3276 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v);
3278 }
3279};
3280
2655sub reload_regions { 3281sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = ();
3285
2656 load_resource_file "$MAPDIR/regions" 3286 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 3287 or die "unable to load regions file\n";
3288
3289 for (cf::region::list) {
3290 $_->{match} = qr/$_->{match}/
3291 if exists $_->{match};
3292 }
2658} 3293}
2659 3294
2660sub reload_facedata { 3295sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 3296 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 3297 or die "unable to load facedata\n";
2663} 3298}
2664 3299
2665sub reload_archetypes { 3300sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
2666 load_resource_file "$DATADIR/archetypes" 3306 load_resource_file "$DATADIR/archetypes"
2667 or die "unable to load archetypes\n"; 3307 or die "unable to load archetypes\n";
2668} 3308}
2669 3309
2670sub reload_treasures { 3310sub reload_treasures {
2686 3326
2687sub init { 3327sub init {
2688 reload_resources; 3328 reload_resources;
2689} 3329}
2690 3330
2691sub cfg_load { 3331sub reload_config {
2692 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
2693 or return; 3333 or return;
2694 3334
2695 local $/; 3335 local $/;
2696 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
2697 3337
2698 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2699 3339
2700 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2701 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2712sub main { 3352sub main {
2713 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
2714 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
2715 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716 (async { 3356 (async {
2717 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
2718 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
2719 }; 3360 };
2720 3361
2721 cfg_load; 3362 reload_config;
2722 db_init; 3363 db_init;
2723 load_extensions; 3364 load_extensions;
2724 3365
2725 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
2726 Event::loop; 3368 EV::loop;
2727} 3369}
2728 3370
2729############################################################################# 3371#############################################################################
2730# initialisation and cleanup 3372# initialisation and cleanup
2731 3373
2732# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
2733BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
2734 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
2735 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2736 reentrant => 0,
2737 data => WF_AUTOCANCEL,
2738 signal => $signal,
2739 prio => 0,
2740 cb => sub {
2741 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
2742 },
2743 ); 3380 };
2744 } 3381 }
2745} 3382}
2746 3383
2747sub write_runtime { 3384sub write_runtime {
2748 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
2793 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
2794 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
2795 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
2796 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
2797 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2798 $pl->save; 3436 $pl->save;
2799 } 3437 }
2800 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
2801 3439
2802 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
2841 warn "syncing database to disk"; 3479 warn "syncing database to disk";
2842 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
2843 3481
2844 # if anything goes wrong in here, we should simply crash as we already saved 3482 # if anything goes wrong in here, we should simply crash as we already saved
2845 3483
2846 warn "cancelling all WF_AUTOCANCEL watchers";
2847 for (Event::all_watchers) {
2848 $_->cancel if $_->data & WF_AUTOCANCEL;
2849 }
2850
2851 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
2852 for (;;) { 3485 for (;;) {
2853 BDB::flush; 3486 BDB::flush;
2854 IO::AIO::flush; 3487 IO::AIO::flush;
2855 Coro::cede; 3488 Coro::cede_notself;
2856 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
2857 warn "iterate..."; 3490 warn "iterate...";
2858 } 3491 }
2859 3492
2860 ++$RELOAD; 3493 ++$RELOAD;
2864 %EXT_CORO = (); 3497 %EXT_CORO = ();
2865 3498
2866 warn "removing commands"; 3499 warn "removing commands";
2867 %COMMAND = (); 3500 %COMMAND = ();
2868 3501
2869 warn "removing ext commands"; 3502 warn "removing ext/exti commands";
2870 %EXTCMD = (); 3503 %EXTCMD = ();
3504 %EXTICMD = ();
2871 3505
2872 warn "unloading/nuking all extensions"; 3506 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) { 3507 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg"; 3508 warn "... unloading $pkg";
2875 3509
2918 warn "reloading cf.pm"; 3552 warn "reloading cf.pm";
2919 require cf; 3553 require cf;
2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921 3555
2922 warn "loading config and database again"; 3556 warn "loading config and database again";
2923 cf::cfg_load; 3557 cf::reload_config;
2924 3558
2925 warn "loading extensions"; 3559 warn "loading extensions";
2926 cf::load_extensions; 3560 cf::load_extensions;
2927 3561
2928 warn "reattaching attachments to objects/players"; 3562 warn "reattaching attachments to objects/players";
2935 warn "leaving sync_job"; 3569 warn "leaving sync_job";
2936 3570
2937 1 3571 1
2938 } or do { 3572 } or do {
2939 warn $@; 3573 warn $@;
2940 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
2941 exit 1;
2942 }; 3575 };
2943 3576
2944 warn "reloaded"; 3577 warn "reloaded";
2945}; 3578};
2946 3579
2948 3581
2949sub reload_perl() { 3582sub reload_perl() {
2950 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
2951 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
2952 3585
2953 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2954 reentrant => 0,
2955 after => 0,
2956 data => WF_AUTOCANCEL,
2957 cb => sub {
2958 do_reload_perl; 3587 do_reload_perl;
2959 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
2960 },
2961 ); 3589 };
2962} 3590}
2963 3591
2964register_command "reload" => sub { 3592register_command "reload" => sub {
2965 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
2966 3594
2967 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
2968 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
2969 async { reload_perl }; 3599 reload_perl;
3600 };
2970 } 3601 }
2971}; 3602};
2972 3603
2973unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
2974 3605
2976 3607
2977our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
2978our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
2979 3610
2980sub wait_for_tick { 3611sub wait_for_tick {
2981 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
2982 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
2983 3614
2984 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
2985 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
2986 $signal->wait; 3617 $signal->wait;
2987} 3618}
2988 3619
2989sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
2990 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
2991 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
2992 3623
2993 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
2994 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
2995 $signal->wait; 3626 $signal->wait;
2996} 3627}
2997 3628
2998 my $min = 1e6;#d# 3629sub tick {
2999 my $avg = 10;
3000$TICK_WATCHER = Event->timer (
3001 reentrant => 0,
3002 parked => 1,
3003 prio => 0,
3004 at => $NEXT_TICK || $TICK,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3008 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3009 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3010 return; 3633 return;
3011 } 3634 }
3012 3635
3013 $NOW = $tick_start = Event::time;
3014
3015 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3016 3637
3017 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3018 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3019 my $t = Event::time; 3640 Coro::async_pool {
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3021 or die; 3642 write_runtime
3022 3643 or warn "ERROR: unable to write runtime file: $!";
3023 $map->width (50);
3024 $map->height (50);
3025 $map->alloc;
3026 $map->_load_objects ("/tmp/x.map", 1);
3027 my $t = Event::time - $t;
3028
3029 #next unless $t < 0.0013;#d#
3030 if ($t < $min) {
3031 $min = $t;
3032 }
3033 $avg = $avg * 0.99 + $t * 0.01;
3034 }
3035 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036 exit 0;
3037 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038 }; 3644 };
3645 }
3039 3646
3040 $RUNTIME += $TICK;
3041 $NEXT_TICK += $TICK;
3042
3043 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044 $NEXT_RUNTIME_WRITE = $NOW + 10;
3045 Coro::async_pool {
3046 write_runtime
3047 or warn "ERROR: unable to write runtime file: $!";
3048 };
3049 }
3050
3051# my $AFTER = Event::time;
3052# warn $AFTER - $NOW;#d#
3053
3054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send; 3648 $sig->send;
3056 } 3649 }
3057 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send; 3651 $sig->send;
3059 } 3652 }
3060 3653
3061 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3062
3063 # if we are delayed by four ticks or more, skip them all
3064 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3065
3066 $TICK_WATCHER->at ($NEXT_TICK);
3067 $TICK_WATCHER->start;
3068
3069 $LOAD = ($NOW - $tick_start) / $TICK;
3070 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071 3656
3072 _post_tick; 3657 if (0) {
3073 3658 if ($NEXT_TICK) {
3074 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3075 }, 3663 }
3076); 3664}
3077 3665
3078{ 3666{
3079 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3080 $BDB_POLL_WATCHER = Event->io ( 3668
3081 reentrant => 0,
3082 fd => BDB::poll_fileno,
3083 poll => 'r',
3084 prio => 0,
3085 data => WF_AUTOCANCEL,
3086 cb => \&BDB::poll_cb,
3087 );
3088 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3089 3670 BDB::max_poll_reqs $TICK * 0.1;
3090 BDB::set_sync_prepare { 3671 $Coro::BDB::WATCHER->priority (1);
3091 my $status;
3092 my $current = $Coro::current;
3093 (
3094 sub {
3095 $status = $!;
3096 $current->ready; undef $current;
3097 },
3098 sub {
3099 Coro::schedule while defined $current;
3100 $! = $status;
3101 },
3102 )
3103 };
3104 3672
3105 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3106 $DB_ENV = BDB::db_env_create; 3674 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3676 | BDB::LOG_AUTOREMOVE, 1);
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3107 3679
3108 cf::sync_job { 3680 cf::sync_job {
3109 eval { 3681 eval {
3110 BDB::db_env_open 3682 BDB::db_env_open
3111 $DB_ENV, 3683 $DB_ENV,
3113 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3685 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115 0666; 3687 0666;
3116 3688
3117 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120 $DB_ENV->set_lk_detect;
3121 }; 3690 };
3122 3691
3123 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3124 }; 3693 };
3125 } 3694 }
3695
3696 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3697 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3698 };
3699 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3701 };
3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3704 };
3126} 3705}
3127 3706
3128{ 3707{
3708 # configure IO::AIO
3709
3129 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3130
3131 undef $Coro::AIO::WATCHER;
3132 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3133 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3134 reentrant => 0,
3135 data => WF_AUTOCANCEL,
3136 fd => IO::AIO::poll_fileno,
3137 poll => 'r',
3138 prio => 6,
3139 cb => \&IO::AIO::poll_cb,
3140 );
3141} 3713}
3142 3714
3143my $_log_backtrace; 3715my $_log_backtrace;
3144 3716
3145sub _log_backtrace { 3717sub _log_backtrace {
3149 3721
3150 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3152 ++$_log_backtrace; 3724 ++$_log_backtrace;
3153 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3154 my @bt = fork_call { 3728 my @bt = fork_call {
3155 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3731 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines