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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.464 by root, Thu Jan 1 18:35:48 2009 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
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5; 56use Digest::MD5;
28use Fcntl; 57use Fcntl;
29use YAML::Syck (); 58use YAML ();
30use IO::AIO 2.32 (); 59use IO::AIO ();
31use Time::HiRes; 60use Time::HiRes;
32use Compress::LZF; 61use Compress::LZF;
62use Digest::MD5 ();
63
64AnyEvent::detect;
33 65
34# configure various modules to our taste 66# configure various modules to our taste
35# 67#
36$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
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
46 76
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 78
49our %COMMAND = (); 79our %COMMAND = ();
50our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
51 81
52our @EXTS = (); # list of extension package names 82our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 83our %EXTCMD = ();
84our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
56 87
57our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 89our @EVENT;
59 90
60our $CONFDIR = confdir; 91our $CONFDIR = confdir;
61our $DATADIR = datadir; 92our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
71 106
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 109our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
79 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 115our $DB_ENV;
82 116
83our %CFG; 117our %CFG;
84 118
85our $UPTIME; $UPTIME ||= time; 119our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 120our $RUNTIME;
121our $NOW;
87 122
88our %PLAYER; # all users 123our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 124our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 125our $LINK_MAP; # the special {link} map, which is always available
91 126
92# used to convert map paths into valid unix filenames by replacing / by ∕ 127# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 128our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 129
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
132our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
98 138
99binmode STDOUT; 139binmode STDOUT;
100binmode STDERR; 140binmode STDERR;
101 141
102# read virtual server time, if available 142# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
107} 147}
108 148
109mkdir $_ 149mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
155 195
156The raw value load value from the last tick. 196The raw value load value from the last tick.
157 197
158=item %cf::CFG 198=item %cf::CFG
159 199
160Configuration for the server, loaded from C</etc/crossfire/config>, or 200Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 201from wherever your confdir points to.
162 202
163=item cf::wait_for_tick, cf::wait_for_tick_begin 203=item cf::wait_for_tick, cf::wait_for_tick_begin
164 204
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 205These 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 206returns 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. 207per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 208
209=item @cf::INVOKE_RESULTS
210
211This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call.
214
169=back 215=back
170 216
171=cut 217=cut
172 218
173BEGIN { 219BEGIN {
… …
177 $msg .= "\n" 223 $msg .= "\n"
178 unless $msg =~ /\n$/; 224 unless $msg =~ /\n$/;
179 225
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 227
182 utf8::encode $msg;
183 LOG llevError, $msg; 228 LOG llevError, $msg;
184 }; 229 };
185} 230}
231
232$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "=="
234
235 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d#
238 }#d#
239
240 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate
243};
244
245$SIG{__DIE__} = sub { }; #d#?
186 246
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
197for my $pkg (qw( 257for my $pkg (qw(
198 cf::global cf::attachable 258 cf::global cf::attachable
199 cf::object cf::object::player 259 cf::object cf::object::player
200 cf::client cf::player 260 cf::client cf::player
201 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
202 cf::map cf::party cf::region 263 cf::party cf::region
203)) { 264)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 266}
207 267
208$Event::DIED = sub { 268$EV::DIED = sub {
209 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
210}; 270};
211 271
212############################################################################# 272#############################################################################
213 273
… …
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 296 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 297 $d
238 } || "[unable to dump $_[0]: '$@']"; 298 } || "[unable to dump $_[0]: '$@']";
239} 299}
240 300
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 301=item $ref = cf::decode_json $json
244 302
245Converts a JSON string into the corresponding perl data structure. 303Converts a JSON string into the corresponding perl data structure.
246 304
247=item $json = cf::to_json $ref 305=item $json = cf::encode_json $ref
248 306
249Converts a perl data structure into its JSON representation. 307Converts a perl data structure into its JSON representation.
250 308
309=cut
310
311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
312
313sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) }
315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
329
251=item cf::lock_wait $string 330=item cf::lock_wait $string
252 331
253Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
254 333
255=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
256 335
257Wait until the given lock is available and then acquires it and returns 336Wait 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, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
260returned. 339returned.
261 340
341Locks are *not* recursive, locking from the same coro twice results in a
342deadlocked coro.
343
262Lock names should begin with a unique identifier (for example, cf::map::find 344Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 345uses map_find and cf::map::load uses map_load).
264 346
265=item $locked = cf::lock_active $string 347=item $locked = cf::lock_active $string
266 348
267Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
268 350
269=cut 351=cut
270 352
271our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
272 354
273sub lock_wait($) { 355sub lock_wait($) {
274 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
275
276 # wait for lock, if any
277 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule;
280 }
281} 357}
282 358
283sub lock_acquire($) { 359sub lock_acquire($) {
284 my ($key) = @_; 360 $LOCKS->guard ($_[0])
285
286 # wait, to be sure we are not locked
287 lock_wait $key;
288
289 $LOCK{$key} = [];
290
291 Coro::guard {
292 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} };
294 }
295} 361}
296 362
297sub lock_active($) { 363sub lock_active($) {
298 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
299
300 ! ! $LOCK{$key}
301} 365}
302 366
303sub freeze_mainloop { 367sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
305 369
306 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
307 $TICK_WATCHER->start; 371}
372
373=item cf::periodic $interval, $cb
374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
386}
387
388=item cf::get_slot $time[, $priority[, $name]]
389
390Allocate $time seconds of blocking CPU time at priority C<$priority>:
391This call blocks and returns only when you have at least C<$time> seconds
392of cpu time till the next tick. The slot is only valid till the next cede.
393
394The optional C<$name> can be used to identify the job to run. It might be
395used for statistical purposes and should identify the same time-class.
396
397Useful for short background jobs.
398
399=cut
400
401our @SLOT_QUEUE;
402our $SLOT_QUEUE;
403
404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
408 my $signal = new Coro::Signal;
409
410 while () {
411 next_job:
412 my $avail = cf::till_tick;
413 if ($avail > 0.01) {
414 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) {
416 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send;
418 Coro::cede;
419 goto next_job;
420 }
421 }
422 }
423
424 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait;
428 } else {
429 Coro::schedule;
430 }
308 }; 431 }
309 $TICK_WATCHER->stop; 432};
310 $guard 433
434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
437 my ($time, $pri, $name) = @_;
438
439 $time = $TICK * .6 if $time > $TICK * .6;
440 my $sig = new Coro::Signal;
441
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready;
445 $sig->wait;
311} 446}
312 447
313=item cf::async { BLOCK } 448=item cf::async { BLOCK }
314 449
315Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
… …
320 455
321BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
322 457
323=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
324 459
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 461is 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 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 463acceptable.
329 464
330If it must be done, put the blocking parts into C<sync_job>. This will run 465If 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 466the given BLOCK in another coroutine while waiting for the result. The
… …
336 471
337sub sync_job(&) { 472sub sync_job(&) {
338 my ($job) = @_; 473 my ($job) = @_;
339 474
340 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 476 my $time = EV::time;
342 477
343 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
345 480
346 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 482
348 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
349 484
350 my $busy = 1; 485 my $busy = 1;
351 my @res; 486 my @res;
352 487
353 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 490 @res = eval { $job->() };
355 warn $@ if $@; 491 warn $@ if $@;
356 undef $busy; 492 undef $busy;
357 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
358 494
359 while ($busy) { 495 while ($busy) {
360 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
361 } 500 }
501 }
362 502
363 $time = Event::time - $time; 503 my $time = EV::time - $time;
364 504
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 505 $TICK_START += $time; # do not account sync jobs to server load
369 506
370 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
371 } else { 508 } else {
372 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
373 510
… …
398=item fork_call { }, $args 535=item fork_call { }, $args
399 536
400Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
404 541
405=cut 542=cut
406 543
407sub fork_call(&@) { 544sub fork_call(&@) {
408 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
409 546
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 547 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 550
415 if (my $pid = fork) { 551 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; 552 reset_signals;
428 local $SIG{__WARN__}; 553 &$cb
429 local $SIG{__DIE__}; 554 }, @args;
430 eval {
431 close $fh1;
432 555
433 my @res = eval { $cb->(@args) }; 556 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 557}
435 };
436 558
437 warn $@ if $@; 559=item $coin = coin_from_name $name
438 _exit 0; 560
439 } 561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
440} 584}
441 585
442=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
443 587
444Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
446=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
447 591
448Stores the given C<$value> in the family. It can currently store binary 592Stores 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). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
451=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
452 618
453our $DB; 619our $DB;
454 620
455sub db_init { 621sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 622 cf::sync_job {
460 eval { 623 $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 } 624 };
470} 625}
471 626
472sub db_get($$) { 627sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
474 629
… …
524 if (1) { 679 if (1) {
525 $md5 = 680 $md5 =
526 join "\x00", 681 join "\x00",
527 $processversion, 682 $processversion,
528 map { 683 map {
529 Coro::cede; 684 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 686 } 0.. $#$src;
532 687
533 688
534 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
… …
572 727
573############################################################################# 728#############################################################################
574 729
575=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
576 731
577Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
578attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
580 735
581In the following description, CLASS can be any of C<global>, C<object> 736In 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 737C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 738Deliantra).
584 739
585=over 4 740=over 4
586 741
587=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
588 743
… …
632=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
633 788
634Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
635given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
636 791
637Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
638that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
639 794
640These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
641 796
642=over 4 797=over 4
… …
840 "; 995 ";
841 die if $@; 996 die if $@;
842} 997}
843 998
844our $override; 999our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1000our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 1001
847sub override { 1002sub override {
848 $override = 1; 1003 $override = 1;
849 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
850} 1005}
851 1006
852sub do_invoke { 1007sub do_invoke {
853 my $event = shift; 1008 my $event = shift;
854 my $callbacks = shift; 1009 my $callbacks = shift;
855 1010
856 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
857 1012
858 local $override; 1013 local $override;
859 1014
860 for (@$callbacks) { 1015 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
… …
870 } 1025 }
871 1026
872 0 1027 0
873} 1028}
874 1029
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1031
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1033
879Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
880 1035
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1036This 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 1037removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1039
885=back 1040=back
886 1041
887=cut 1042=cut
888 1043
889############################################################################# 1044#############################################################################
890# object support 1045# object support
1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
1080sub _can_merge {
1081 my ($ob1, $ob2) = @_;
1082
1083 ++$SLOW_MERGES;#d#
1084
1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
1087}
891 1088
892sub reattach { 1089sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1091 my ($obj) = @_;
895 1092
1093 # no longer needed after getting rid of delete_package?
896 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
897 1095
898 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
899 1097
900 @$registry = (); 1098 @$registry = ();
901 1099
… …
916cf::attachable->attach ( 1114cf::attachable->attach (
917 prio => -1000000, 1115 prio => -1000000,
918 on_instantiate => sub { 1116 on_instantiate => sub {
919 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
920 1118
921 $data = from_json $data; 1119 $data = decode_json $data;
922 1120
923 for (@$data) { 1121 for (@$data) {
924 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
925 1123
926 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
… …
942sub object_freezer_save { 1140sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
944 1142
945 sync_job { 1143 sync_job {
946 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
949 1148
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1153 aio_close $fh;
955 1154
956 if (@$objs) { 1155 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1161 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
964 } 1163 }
965 } else { 1164 } else {
966 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
967 } 1166 }
968 1167
969 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
970 } else { 1172 } else {
971 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
972 } 1174 }
973 } else { 1175 } else {
974 aio_unlink $filename; 1176 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
976 } 1178 }
977 } 1179 };
978} 1180}
979 1181
980sub object_freezer_as_string { 1182sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1183 my ($rdata, $objs) = @_;
982 1184
… …
994 or return; 1196 or return;
995 1197
996 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
998 or return; 1200 or return;
1201
999 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1000 } 1204 }
1001 1205
1206 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1209
1004 return ($data, $av); 1210 ($data, $av)
1005} 1211}
1006 1212
1007=head2 COMMAND CALLBACKS 1213=head2 COMMAND CALLBACKS
1008 1214
1009=over 4 1215=over 4
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1235 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1236}
1031 1237
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1238=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1239
1034Register a callback fro execution when the client sends an extcmd packet. 1240Register a callback for execution when the client sends an (synchronous)
1241extcmd packet. Ext commands will be processed in the order they are
1242received by the server, like other user commands. The first argument is
1243the logged-in player. Ext commands can only be processed after a player
1244has logged in successfully.
1035 1245
1036If the callback returns something, it is sent back as if reply was being 1246If the callback returns something, it is sent back as if reply was being
1037called. 1247called.
1038 1248
1249=item cf::register_exticmd $name => \&callback($ns,$packet);
1250
1251Register a callback for execution when the client sends an (asynchronous)
1252exticmd packet. Exti commands are processed by the server as soon as they
1253are received, i.e. out of order w.r.t. other commands. The first argument
1254is a client socket. Exti commands can be received anytime, even before
1255log-in.
1256
1257If the callback returns something, it is sent back as if reply was being
1258called.
1259
1039=cut 1260=cut
1040 1261
1041sub register_extcmd { 1262sub register_extcmd {
1042 my ($name, $cb) = @_; 1263 my ($name, $cb) = @_;
1043 1264
1044 $EXTCMD{$name} = $cb; 1265 $EXTCMD{$name} = $cb;
1045} 1266}
1267
1268sub register_exticmd {
1269 my ($name, $cb) = @_;
1270
1271 $EXTICMD{$name} = $cb;
1272}
1273
1274use File::Glob ();
1046 1275
1047cf::player->attach ( 1276cf::player->attach (
1048 on_command => sub { 1277 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1050 1279
… …
1058 cf::override; 1287 cf::override;
1059 }, 1288 },
1060 on_extcmd => sub { 1289 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1290 my ($pl, $buf) = @_;
1062 1291
1063 my $msg = eval { from_json $buf }; 1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1293
1065 if (ref $msg) { 1294 if (ref $msg) {
1295 my ($type, $reply, @payload) =
1296 "ARRAY" eq ref $msg
1297 ? @$msg
1298 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1299
1300 my @reply;
1301
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1302 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1303 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1304 }
1305
1306 $pl->ext_reply ($reply, @reply)
1307 if $reply;
1308
1071 } else { 1309 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1311 }
1074 1312
1075 cf::override; 1313 cf::override;
1076 }, 1314 },
1077); 1315);
1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1078 1329
1079sub load_extensions { 1330sub load_extensions {
1080 cf::sync_job { 1331 cf::sync_job {
1081 my %todo; 1332 my %todo;
1082 1333
… …
1102 1353
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1356
1106 $ext{source} = 1357 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1109 . $source 1360 . $source
1110 . "\n};\n1"; 1361 . "\n};\n1";
1111 1362
1112 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
… …
1128 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1130 1381
1131 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1383 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1385 }
1136 1386
1137 warn $msg; 1387 warn $msg;
1138 } 1388 }
1139 1389
… …
1153 1403
1154=back 1404=back
1155 1405
1156=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1157 1407
1158Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1159 1409
1160=cut 1410=cut
1161 1411
1162package cf::player; 1412package cf::player;
1163 1413
1164use Coro::AIO; 1414use Coro::AIO;
1165 1415
1166=head3 cf::player 1416=head3 cf::player
1167 1417
1168=over 4 1418=over 4
1419
1420=item cf::player::num_playing
1421
1422Returns the official number of playing players, as per the Crossfire metaserver rules.
1423
1424=cut
1425
1426sub num_playing {
1427 scalar grep
1428 $_->ob->map
1429 && !$_->hidden
1430 && !$_->ob->flag (cf::FLAG_WIZ),
1431 cf::player::list
1432}
1169 1433
1170=item cf::player::find $login 1434=item cf::player::find $login
1171 1435
1172Returns the given player object, loading it if necessary (might block). 1436Returns the given player object, loading it if necessary (might block).
1173 1437
… …
1192 1456
1193sub exists($) { 1457sub exists($) {
1194 my ($login) = @_; 1458 my ($login) = @_;
1195 1459
1196 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1197 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1198} 1462}
1199 1463
1200sub find($) { 1464sub find($) {
1201 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1202 my $login = $_[0]; 1466 my $login = $_[0];
… …
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1473 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1474 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1475 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1476 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1477
1214 my $pl = load_pl path $login 1478 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1479 or return;
1480
1481 my $pl = cf::player::load_pl $f
1482 or return;
1483
1484 local $cf::PLAYER_LOADING{$login} = $pl;
1485 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1217 } 1487 }
1218 } 1488 }
1219} 1489}
1220 1490
… …
1229 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1230 1500
1231 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1233 1503
1504 cf::get_slot 0.01;
1505
1234 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1235 Coro::cede; 1507 cf::cede_to_tick;
1236} 1508}
1237 1509
1238sub new($) { 1510sub new($) {
1239 my ($login) = @_; 1511 my ($login) = @_;
1240 1512
… …
1246 $cf::PLAYER{$login} = $self; 1518 $cf::PLAYER{$login} = $self;
1247 1519
1248 $self 1520 $self
1249} 1521}
1250 1522
1523=item $player->send_msg ($channel, $msg, $color, [extra...])
1524
1525=cut
1526
1527sub send_msg {
1528 my $ns = shift->ns
1529 or return;
1530 $ns->send_msg (@_);
1531}
1532
1251=item $pl->quit_character 1533=item $pl->quit_character
1252 1534
1253Nukes the player without looking back. If logged in, the connection will 1535Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1536be destroyed. May block for a long time.
1255 1537
… …
1259 my ($pl) = @_; 1541 my ($pl) = @_;
1260 1542
1261 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1262 1544
1263 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1264 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1265 1547
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1270 1554
1271 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1308 or return []; 1592 or return [];
1309 1593
1310 my @logins; 1594 my @logins;
1311 1595
1312 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1597 my $path = path $login;
1598
1599 # a .pst is a dead give-away for a valid player
1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1605 }
1316 1606
1317 utf8::decode $login; 1607 utf8::decode $login;
1318 push @logins, $login; 1608 push @logins, $login;
1319 } 1609 }
1320 1610
… …
1347 } 1637 }
1348 1638
1349 \@paths 1639 \@paths
1350} 1640}
1351 1641
1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1643
1644Expand deliantra pod fragments into protocol xml.
1645
1352=item $player->ext_reply ($msgid, %msg) 1646=item $player->ext_reply ($msgid, @msg)
1353 1647
1354Sends an ext reply to the player. 1648Sends an ext reply to the player.
1355 1649
1356=cut 1650=cut
1357 1651
1358sub ext_reply($$%) { 1652sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1653 my ($self, $id, @msg) = @_;
1360 1654
1361 $msg{msgid} = $id; 1655 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1656}
1365 1657
1366=item $player->ext_event ($type, %msg) 1658=item $player->ext_msg ($type, @msg)
1367 1659
1368Sends an ext event to the client. 1660Sends an ext event to the client.
1369 1661
1370=cut 1662=cut
1371 1663
1372sub ext_event($$%) { 1664sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1665 my ($self, $type, @msg) = @_;
1374 1666
1375 $self->ns->ext_event ($type, %msg); 1667 $self->ns->ext_msg ($type, @msg);
1376} 1668}
1377 1669
1378=head3 cf::region 1670=head3 cf::region
1379 1671
1380=over 4 1672=over 4
… …
1393 my ($path) = @_; 1685 my ($path) = @_;
1394 1686
1395 my ($match, $specificity); 1687 my ($match, $specificity);
1396 1688
1397 for my $region (list) { 1689 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1690 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1691 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1692 if $region->specificity > $specificity;
1401 } 1693 }
1402 } 1694 }
1403 1695
… …
1424our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1425our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1426 1718
1427sub generate_random_map { 1719sub generate_random_map {
1428 my ($self, $rmp) = @_; 1720 my ($self, $rmp) = @_;
1721
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723
1429 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1430 $self->_create_random_map ( 1725 $self->_create_random_map (
1431 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1432 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1433 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1523 $self->init; # pass $1 etc. 1818 $self->init; # pass $1 etc.
1524 return $self; 1819 return $self;
1525 } 1820 }
1526 } 1821 }
1527 1822
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1823 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1824 ()
1530} 1825}
1531 1826
1532sub init { 1827sub init {
1533 my ($self) = @_; 1828 my ($self) = @_;
… …
1555 1850
1556# the temporary/swap location 1851# the temporary/swap location
1557sub save_path { 1852sub save_path {
1558 my ($self) = @_; 1853 my ($self) = @_;
1559 1854
1560 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1561 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1562} 1857}
1563 1858
1564# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1565sub uniq_path { 1860sub uniq_path {
1566 my ($self) = @_; 1861 my ($self) = @_;
1567 1862
1568 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1569 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1570}
1571
1572# and all this just because we cannot iterate over
1573# all maps in C++...
1574sub change_all_map_light {
1575 my ($change) = @_;
1576
1577 $_->change_map_light ($change)
1578 for grep $_->outdoor, values %cf::MAP;
1579} 1865}
1580 1866
1581sub decay_objects { 1867sub decay_objects {
1582 my ($self) = @_; 1868 my ($self) = @_;
1583 1869
… …
1596 1882
1597sub load_header_from($) { 1883sub load_header_from($) {
1598 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1599 1885
1600 utf8::encode $path; 1886 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1606 1895
1607 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1608 1897
1609 1 1898 1
1610} 1899}
… …
1664sub find { 1953sub find {
1665 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1666 1955
1667 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1668 1957
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1670 1960
1671 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1672 my $guard = cf::lock_acquire "map_find:$path";
1673 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1674 or return; 1963 or return;
1675 1964
1676 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1677 1966
… …
1679 or return; 1968 or return;
1680 1969
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1974 undef $guard1;
1684 $map->reset; 1975 $map->reset;
1685 undef $guard;
1686 return find $path; 1976 return find $path;
1687 } 1977 }
1688 1978
1689 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1690 } 1980 }
… …
1699 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1700 1990
1701 my $path = $self->{path}; 1991 my $path = $self->{path};
1702 1992
1703 { 1993 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1705 1995
1996 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 1998
1708 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1709 2000
1710 $self->alloc; 2001 $self->alloc;
1711 2002
1712 $self->pre_load; 2003 $self->pre_load;
1713 Coro::cede; 2004 cf::cede_to_tick;
1714 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1716 or return; 2009 or return;
1717 2010
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1719 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1720 2013
1721 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2015 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2018 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1726 } 2022 }
1727 } 2023 }
1728 2024
1729 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1730 # now do the right thing for maps 2028 # now do the right thing for maps
1731 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2031 unless $self->difficulty;
1734 Coro::cede; 2032 cf::cede_to_tick;
1735 2033
1736 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2035 $self->decay_objects;
1738 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1739 $self->update_buttons; 2037 $self->update_buttons;
1740 Coro::cede; 2038 cf::cede_to_tick;
1741 $self->set_darkness_map;
1742 Coro::cede;
1743 $self->activate; 2039 $self->activate;
1744 } 2040 }
1745 2041
2042 $self->{last_save} = $cf::RUNTIME;
2043 $self->last_access ($cf::RUNTIME);
2044
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2045 $self->in_memory (cf::MAP_ACTIVE);
1747 } 2046 }
1748 2047
1749 $self->post_load; 2048 $self->post_load;
1750} 2049}
1751 2050
… …
1760 2059
1761 $self 2060 $self
1762} 2061}
1763 2062
1764# find and load all maps in the 3x3 area around a map 2063# find and load all maps in the 3x3 area around a map
1765sub load_diag { 2064sub load_neighbours {
1766 my ($map) = @_; 2065 my ($map) = @_;
1767 2066
1768 my @diag; # diagonal neighbours 2067 my @neigh; # diagonal neighbours
1769 2068
1770 for (0 .. 3) { 2069 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2070 my $neigh = $map->tile_path ($_)
1772 or next; 2071 or next;
1773 $neigh = find $neigh, $map 2072 $neigh = find $neigh, $map
1774 or next; 2073 or next;
1775 $neigh->load; 2074 $neigh->load;
1776 2075
2076 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2077 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2078 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2079 }
1780 2080
1781 for (@diag) { 2081 for (grep defined $_->[0], @neigh) {
2082 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2083 my $neigh = find $path, $origin
1783 or next; 2084 or next;
1784 $neigh->load; 2085 $neigh->load;
1785 } 2086 }
1786} 2087}
1787 2088
… …
1792} 2093}
1793 2094
1794sub do_load_sync { 2095sub do_load_sync {
1795 my ($map) = @_; 2096 my ($map) = @_;
1796 2097
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main;
2100
1797 cf::sync_job { $map->load }; 2101 cf::sync_job { $map->load };
1798} 2102}
1799 2103
1800our %MAP_PREFETCH; 2104our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2105our $MAP_PREFETCHER = undef;
1802 2106
1803sub find_async { 2107sub find_async {
1804 my ($path, $origin) = @_; 2108 my ($path, $origin, $load) = @_;
1805 2109
1806 $path = normalise $path, $origin && $origin->{path}; 2110 $path = normalise $path, $origin && $origin->{path};
1807 2111
1808 if (my $map = $cf::MAP{$path}) { 2112 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1810 } 2114 }
1811 2115
1812 undef $MAP_PREFETCH{$path}; 2116 $MAP_PREFETCH{$path} |= $load;
2117
1813 $MAP_PREFETCHER ||= cf::async { 2118 $MAP_PREFETCHER ||= cf::async {
2119 $Coro::current->{desc} = "map prefetcher";
2120
1814 while (%MAP_PREFETCH) { 2121 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2122 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2123 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2124 $map->load if $v;
2125 }
1819 2126
1820 delete $MAP_PREFETCH{$path}; 2127 delete $MAP_PREFETCH{$k};
1821 } 2128 }
1822 } 2129 }
1823 undef $MAP_PREFETCHER; 2130 undef $MAP_PREFETCHER;
1824 }; 2131 };
1825 $MAP_PREFETCHER->prio (6); 2132 $MAP_PREFETCHER->prio (6);
… …
1828} 2135}
1829 2136
1830sub save { 2137sub save {
1831 my ($self) = @_; 2138 my ($self) = @_;
1832 2139
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2141
1835 $self->{last_save} = $cf::RUNTIME; 2142 $self->{last_save} = $cf::RUNTIME;
1836 2143
1837 return unless $self->dirty; 2144 return unless $self->dirty;
1838 2145
… …
1844 return if $self->{deny_save}; 2151 return if $self->{deny_save};
1845 2152
1846 local $self->{last_access} = $self->last_access;#d# 2153 local $self->{last_access} = $self->last_access;#d#
1847 2154
1848 cf::async { 2155 cf::async {
2156 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2157 $_->contr->save for $self->players;
1850 }; 2158 };
2159
2160 cf::get_slot 0.02;
1851 2161
1852 if ($uniq) { 2162 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1854 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2164 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1855 } else { 2165 } else {
… …
1861 my ($self) = @_; 2171 my ($self) = @_;
1862 2172
1863 # save first because save cedes 2173 # save first because save cedes
1864 $self->save; 2174 $self->save;
1865 2175
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2177
1868 return if $self->players; 2178 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_ACTIVE;
1870 return if $self->{deny_save}; 2180 return if $self->{deny_save};
1871 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2186 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2187}
1875 2188
1876sub reset_at { 2189sub reset_at {
1877 my ($self) = @_; 2190 my ($self) = @_;
1878 2191
… …
1910 if $uniq; 2223 if $uniq;
1911 } 2224 }
1912 2225
1913 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
1914 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2230 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2231
1919 $self->unlink_save; 2232 $self->unlink_save;
1920 $self->destroy; 2233 $self->destroy;
1921} 2234}
1922 2235
1923my $nuke_counter = "aaaa"; 2236my $nuke_counter = "aaaa";
1924 2237
1925sub nuke { 2238sub nuke {
1926 my ($self) = @_; 2239 my ($self) = @_;
1927 2240
2241 {
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
1928 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
1929 2245
1930 $self->unlink_save; 2246 $self->unlink_save;
1931 2247
1932 bless $self, "cf::map"; 2248 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2249 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2250 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2251 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2253
1938 $cf::MAP{$self->path} = $self; 2254 $cf::MAP{$self->path} = $self;
2255 }
1939 2256
1940 $self->reset; # polite request, might not happen 2257 $self->reset; # polite request, might not happen
1941} 2258}
1942 2259
1943=item $maps = cf::map::tmp_maps 2260=item $maps = cf::map::tmp_maps
… …
1985 2302
1986sub unique_maps() { 2303sub unique_maps() {
1987 [ 2304 [
1988 map { 2305 map {
1989 utf8::decode $_; 2306 utf8::decode $_;
1990 /\.map$/ 2307 s/\.map$//; # TODO future compatibility hack
2308 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2309 ? ()
1991 ? normalise $_ 2310 : normalise $_
1992 : ()
1993 } @{ aio_readdir $UNIQUEDIR or [] } 2311 } @{ aio_readdir $UNIQUEDIR or [] }
1994 ] 2312 ]
1995} 2313}
1996 2314
1997package cf;
1998
1999=back 2315=back
2000 2316
2001=head3 cf::object 2317=head3 cf::object
2002 2318
2003=cut 2319=cut
… …
2006 2322
2007=over 4 2323=over 4
2008 2324
2009=item $ob->inv_recursive 2325=item $ob->inv_recursive
2010 2326
2011Returns the inventory of the object _and_ their inventories, recursively. 2327Returns the inventory of the object I<and> their inventories, recursively,
2328but I<not> the object itself.
2012 2329
2013=cut 2330=cut
2014 2331
2015sub inv_recursive_; 2332sub inv_recursive_;
2016sub inv_recursive_ { 2333sub inv_recursive_ {
… …
2019 2336
2020sub inv_recursive { 2337sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2022} 2339}
2023 2340
2341=item $ref = $ob->ref
2342
2343Creates and returns a persistent reference to an object that can be stored as a string.
2344
2345=item $ob = cf::object::deref ($refstring)
2346
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block.
2349
2350=cut
2351
2352sub deref {
2353 my ($ref) = @_;
2354
2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2356 my ($uuid, $name) = ($1, $2);
2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2358 or return;
2359 $pl->ob->uuid eq $uuid
2360 or return;
2361
2362 $pl->ob
2363 } else {
2364 warn "$ref: cannot resolve object reference\n";
2365 undef
2366 }
2367}
2368
2024package cf; 2369package cf;
2025 2370
2026=back 2371=back
2027 2372
2028=head3 cf::object::player 2373=head3 cf::object::player
… …
2034Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2379Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2035can be C<undef>. Does the right thing when the player is currently in a 2380can be C<undef>. Does the right thing when the player is currently in a
2036dialogue with the given NPC character. 2381dialogue with the given NPC character.
2037 2382
2038=cut 2383=cut
2384
2385our $SAY_CHANNEL = {
2386 id => "say",
2387 title => "Map",
2388 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2390};
2391
2392our $CHAT_CHANNEL = {
2393 id => "chat",
2394 title => "Chat",
2395 reply => "chat ",
2396 tooltip => "Player chat and shouts, global to the server.",
2397};
2039 2398
2040# rough implementation of a future "reply" method that works 2399# rough implementation of a future "reply" method that works
2041# with dialog boxes. 2400# with dialog boxes.
2042#TODO: the first argument must go, split into a $npc->reply_to ( method 2401#TODO: the first argument must go, split into a $npc->reply_to ( method
2043sub cf::object::player::reply($$$;$) { 2402sub cf::object::player::reply($$$;$) {
… …
2050 2409
2051 } else { 2410 } else {
2052 my $pl = $self->contr; 2411 my $pl = $self->contr;
2053 2412
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2413 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2414 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2415 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2416
2060 } else { 2417 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2418 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2419 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2063 } 2420 }
2064 } 2421 }
2422}
2423
2424=item $object->send_msg ($channel, $msg, $color, [extra...])
2425
2426=cut
2427
2428sub cf::object::send_msg {
2429 my $pl = shift->contr
2430 or return;
2431 $pl->send_msg (@_);
2065} 2432}
2066 2433
2067=item $player_object->may ("access") 2434=item $player_object->may ("access")
2068 2435
2069Returns wether the given player is authorized to access resource "access" 2436Returns wether the given player is authorized to access resource "access"
… …
2082 2449
2083=item $player_object->enter_link 2450=item $player_object->enter_link
2084 2451
2085Freezes the player and moves him/her to a special map (C<{link}>). 2452Freezes the player and moves him/her to a special map (C<{link}>).
2086 2453
2087The player should be reasonably safe there for short amounts of time. You 2454The player should be reasonably safe there for short amounts of time (e.g.
2088I<MUST> call C<leave_link> as soon as possible, though. 2455for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link
2457map.
2089 2458
2090Will never block. 2459Will never block.
2091 2460
2092=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2093 2462
… …
2148 # use -1 or undef as default coordinates, not 0, 0 2517 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2518 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2519 if $x <=0 && $y <= 0;
2151 2520
2152 $map->load; 2521 $map->load;
2153 $map->load_diag; 2522 $map->load_neighbours;
2154 2523
2155 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2156 $self->activate_recursive; 2526 $self->activate_recursive;
2157 2527
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2160} 2530}
2161 2531
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2533
2164Moves the player to the given map-path and coordinates by first freezing 2534Moves the player to the given map-path and coordinates by first freezing
2165her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2166that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
2167the new (success) or old (failed) map position. 2537the new (success) or old (failed) map position. In either case, $done will
2538be called at the end of this process.
2539
2540Note that $check will be called with a potentially non-loaded map, so if
2541it needs a loaded map it has to call C<< ->load >>.
2168 2542
2169=cut 2543=cut
2170 2544
2171our $GOTOGEN; 2545our $GOTOGEN;
2172 2546
2173sub cf::object::player::goto { 2547sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2548 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2549
2176 # do generation counting so two concurrent goto's will be executed in-order 2550 # do generation counting so two concurrent goto's will be executed in-order
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2552
2179 $self->enter_link; 2553 $self->enter_link;
2180 2554
2181 (async { 2555 (async {
2556 $Coro::current->{desc} = "player::goto $path $x $y";
2557
2558 # *tag paths override both path and x|y
2559 if ($path =~ /^\*(.*)$/) {
2560 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2561 my $ob = $obs[rand @obs];
2562
2563 # see if we actually can go there
2564 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2565 $ob = $obs[rand @obs];
2566 } else {
2567 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2568 }
2569 # else put us there anyways for now #d#
2570
2571 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2572 } else {
2573 ($path, $x, $y) = (undef, undef, undef);
2574 }
2575 }
2576
2182 my $map = eval { 2577 my $map = eval {
2183 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2184 2579
2185 if ($map) { 2580 if ($map) {
2186 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2187 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2188 } else { 2583 } else {
2189 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2190 } 2585 }
2191 2586
2192 $map 2587 $map
2193 }; 2588 };
2194 2589
… …
2199 2594
2200 if ($gen == $self->{_goto_generation}) { 2595 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2596 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2597 $self->leave_link ($map, $x, $y);
2203 } 2598 }
2599
2600 $done->() if $done;
2204 })->prio (1); 2601 })->prio (1);
2205} 2602}
2206 2603
2207=item $player_object->enter_exit ($exit_object) 2604=item $player_object->enter_exit ($exit_object)
2208 2605
… …
2228} 2625}
2229 2626
2230sub prepare_random_map { 2627sub prepare_random_map {
2231 my ($exit) = @_; 2628 my ($exit) = @_;
2232 2629
2233 my $guard = cf::lock_acquire "exit_prepare:$exit";
2234
2235 # all this does is basically replace the /! path by 2630 # all this does is basically replace the /! path by
2236 # a new random map path (?random/...) with a seed 2631 # a new random map path (?random/...) with a seed
2237 # that depends on the exit object 2632 # that depends on the exit object
2238 2633
2239 my $rmp = parse_random_map_params $exit->msg; 2634 my $rmp = parse_random_map_params $exit->msg;
… …
2241 if ($exit->map) { 2636 if ($exit->map) {
2242 $rmp->{region} = $exit->region->name; 2637 $rmp->{region} = $exit->region->name;
2243 $rmp->{origin_map} = $exit->map->path; 2638 $rmp->{origin_map} = $exit->map->path;
2244 $rmp->{origin_x} = $exit->x; 2639 $rmp->{origin_x} = $exit->x;
2245 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2641
2642 $exit->map->touch;
2246 } 2643 }
2247 2644
2248 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2249 2646
2250 my $data = cf::to_json $rmp; 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2251 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2252 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2253 2650
2254 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2255 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2256 undef $fh; 2653 undef $fh;
2257 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
2258 2655
2656 my $slaying = "?random/$md5";
2657
2658 if ($exit->valid) {
2259 $exit->slaying ("?random/$md5"); 2659 $exit->slaying ("?random/$md5");
2260 $exit->msg (undef); 2660 $exit->msg (undef);
2661 }
2261 } 2662 }
2262} 2663}
2263 2664
2264sub cf::object::player::enter_exit { 2665sub cf::object::player::enter_exit {
2265 my ($self, $exit) = @_; 2666 my ($self, $exit) = @_;
2266 2667
2267 return unless $self->type == cf::PLAYER; 2668 return unless $self->type == cf::PLAYER;
2268 2669
2269 if ($exit->slaying eq "/!") {
2270 #TODO: this should de-fi-ni-te-ly not be a sync-job
2271 # the problem is that $exit might not survive long enough
2272 # so it needs to be done right now, right here
2273 cf::sync_job { prepare_random_map $exit };
2274 }
2275
2276 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2277 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp;
2279
2280 $self->enter_link; 2670 $self->enter_link;
2281 2671
2282 (async { 2672 (async {
2283 $self->deactivate_recursive; # just to be sure 2673 $Coro::current->{desc} = "enter_exit";
2674
2284 unless (eval { 2675 unless (eval {
2676 $self->deactivate_recursive; # just to be sure
2677
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2687 my $x = $exit->stats->hp;
2688 my $y = $exit->stats->sp;
2689
2285 $self->goto ($slaying, $hp, $sp); 2690 $self->goto ($map, $x, $y);
2286 2691
2692 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y)
2694 if $exit->flag (cf::FLAG_DAMNED);
2695
2287 1; 2696 1
2288 }) { 2697 }) {
2289 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2290 . "I'll try to bring you back to the map you were before. " 2699 . "I'll try to bring you back to the map you were before. "
2291 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2292 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2293 2702
2294 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
… …
2313 2722
2314 utf8::encode $text; 2723 utf8::encode $text;
2315 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316} 2725}
2317 2726
2727=item $client->send_msg ($channel, $msg, $color, [extra...])
2728
2729Send a drawinfo or msg packet to the client, formatting the msg for the
2730client if neccessary. C<$type> should be a string identifying the type of
2731the message, with C<log> being the default. If C<$color> is negative, suppress
2732the message unless the client supports the msg packet.
2733
2734=cut
2735
2736# non-persistent channels (usually the info channel)
2737our %CHANNEL = (
2738 "c/identify" => {
2739 id => "infobox",
2740 title => "Identify",
2741 reply => undef,
2742 tooltip => "Items recently identified",
2743 },
2744 "c/examine" => {
2745 id => "infobox",
2746 title => "Examine",
2747 reply => undef,
2748 tooltip => "Signs and other items you examined",
2749 },
2750 "c/book" => {
2751 id => "infobox",
2752 title => "Book",
2753 reply => undef,
2754 tooltip => "The contents of a note or book",
2755 },
2756 "c/lookat" => {
2757 id => "infobox",
2758 title => "Look",
2759 reply => undef,
2760 tooltip => "What you saw there",
2761 },
2762 "c/who" => {
2763 id => "infobox",
2764 title => "Players",
2765 reply => undef,
2766 tooltip => "Shows players who are currently online",
2767 },
2768 "c/body" => {
2769 id => "infobox",
2770 title => "Body Parts",
2771 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available",
2773 },
2774 "c/skills" => {
2775 id => "infobox",
2776 title => "Skills",
2777 reply => undef,
2778 tooltip => "Shows your experience per skill and item power",
2779 },
2780 "c/uptime" => {
2781 id => "infobox",
2782 title => "Uptime",
2783 reply => undef,
2784 tooltip => "How long the server has been running since last restart",
2785 },
2786 "c/mapinfo" => {
2787 id => "infobox",
2788 title => "Map Info",
2789 reply => undef,
2790 tooltip => "Information related to the maps",
2791 },
2792 "c/party" => {
2793 id => "party",
2794 title => "Party",
2795 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party",
2797 },
2798 "c/death" => {
2799 id => "death",
2800 title => "Death",
2801 reply => undef,
2802 tooltip => "Reason for and more info about your most recent death",
2803 },
2804 "c/say" => $SAY_CHANNEL,
2805 "c/chat" => $CHAT_CHANNEL,
2806);
2807
2808sub cf::client::send_msg {
2809 my ($self, $channel, $msg, $color, @extra) = @_;
2810
2811 $msg = $self->pl->expand_cfpod ($msg)
2812 unless $color & cf::NDI_VERBATIM;
2813
2814 $color &= cf::NDI_CLIENT_MASK; # just in case...
2815
2816 # check predefined channels, for the benefit of C
2817 if ($CHANNEL{$channel}) {
2818 $channel = $CHANNEL{$channel};
2819
2820 $self->ext_msg (channel_info => $channel);
2821 $channel = $channel->{id};
2822
2823 } elsif (ref $channel) {
2824 # send meta info to client, if not yet sent
2825 unless (exists $self->{channel}{$channel->{id}}) {
2826 $self->{channel}{$channel->{id}} = $channel;
2827 $self->ext_msg (channel_info => $channel);
2828 }
2829
2830 $channel = $channel->{id};
2831 }
2832
2833 return unless @extra || length $msg;
2834
2835 # default colour, mask it out
2836 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2837 if $color & cf::NDI_DEF;
2838
2839 my $pkt = "msg "
2840 . $self->{json_coder}->encode (
2841 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2842 );
2843
2844 # try lzf for large packets
2845 $pkt = "lzf " . Compress::LZF::compress $pkt
2846 if 1024 <= length $pkt and $self->{can_lzf};
2847
2848 # split very large packets
2849 if (8192 < length $pkt and $self->{can_lzf}) {
2850 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2851 $pkt = "frag";
2852 }
2853
2854 $self->send_packet ($pkt);
2855}
2856
2318=item $client->ext_event ($type, %msg) 2857=item $client->ext_msg ($type, @msg)
2319 2858
2320Sends an exti event to the client. 2859Sends an ext event to the client.
2321 2860
2322=cut 2861=cut
2323 2862
2324sub cf::client::ext_event($$%) { 2863sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2864 my ($self, $type, @msg) = @_;
2326 2865
2866 if ($self->extcmd == 2) {
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2868 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2869 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 2870 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2871 }
2872}
2873
2874=item $client->ext_reply ($msgid, @msg)
2875
2876Sends an ext reply to the client.
2877
2878=cut
2879
2880sub cf::client::ext_reply($$@) {
2881 my ($self, $id, @msg) = @_;
2882
2883 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2885 } elsif ($self->extcmd == 1) {
2886 #TODO: version 1, remove
2887 unshift @msg, msgtype => "reply", msgid => $id;
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 }
2329} 2890}
2330 2891
2331=item $success = $client->query ($flags, "text", \&cb) 2892=item $success = $client->query ($flags, "text", \&cb)
2332 2893
2333Queues a query to the client, calling the given callback with 2894Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2895the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2896C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2897
2337Queries can fail, so check the return code. Or don't, as queries will become 2898Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2899become reliable at some point in the future.
2339 2900
2340=cut 2901=cut
2341 2902
2342sub cf::client::query { 2903sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2904 my ($self, $flags, $text, $cb) = @_;
… …
2351 utf8::encode $text; 2912 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2913 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2914
2354 $self->send_packet ($self->{query_queue}[0][0]) 2915 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2916 if @{ $self->{query_queue} } == 1;
2917
2918 1
2356} 2919}
2357 2920
2358cf::client->attach ( 2921cf::client->attach (
2922 on_connect => sub {
2923 my ($ns) = @_;
2924
2925 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2926 },
2359 on_reply => sub { 2927 on_reply => sub {
2360 my ($ns, $msg) = @_; 2928 my ($ns, $msg) = @_;
2361 2929
2362 # this weird shuffling is so that direct followup queries 2930 # this weird shuffling is so that direct followup queries
2363 # get handled first 2931 # get handled first
… …
2375 } else { 2943 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2944 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2945 }
2378 } 2946 }
2379 }, 2947 },
2948 on_exticmd => sub {
2949 my ($ns, $buf) = @_;
2950
2951 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2952
2953 if (ref $msg) {
2954 my ($type, $reply, @payload) =
2955 "ARRAY" eq ref $msg
2956 ? @$msg
2957 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2958
2959 my @reply;
2960
2961 if (my $cb = $EXTICMD{$type}) {
2962 @reply = $cb->($ns, @payload);
2963 }
2964
2965 $ns->ext_reply ($reply, @reply)
2966 if $reply;
2967
2968 } else {
2969 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2970 }
2971
2972 cf::override;
2973 },
2380); 2974);
2381 2975
2382=item $client->async (\&cb) 2976=item $client->async (\&cb)
2383 2977
2384Create a new coroutine, running the specified callback. The coroutine will 2978Create a new coroutine, running the specified callback. The coroutine will
… …
2425our $safe = new Safe "safe"; 3019our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 3020our $safe_hole = new Safe::Hole;
2427 3021
2428$SIG{FPE} = 'IGNORE'; 3022$SIG{FPE} = 'IGNORE';
2429 3023
2430$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3024$safe->permit_only (Opcode::opset qw(
3025 :base_core :base_mem :base_orig :base_math
3026 grepstart grepwhile mapstart mapwhile
3027 sort time
3028));
2431 3029
2432# here we export the classes and methods available to script code 3030# here we export the classes and methods available to script code
2433 3031
2434=pod 3032=pod
2435 3033
2436The following functions and methods are available within a safe environment: 3034The following functions and methods are available within a safe environment:
2437 3035
2438 cf::object contr pay_amount pay_player map 3036 cf::object
3037 contr pay_amount pay_player map x y force_find force_add destroy
3038 insert remove name archname title slaying race decrease split
3039
2439 cf::object::player player 3040 cf::object::player
2440 cf::player peaceful 3041 player
2441 cf::map trigger 3042
3043 cf::player
3044 peaceful
3045
3046 cf::map
3047 trigger
2442 3048
2443=cut 3049=cut
2444 3050
2445for ( 3051for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3053 insert remove inv nrof name archname title slaying race
3054 decrease split destroy change_exp)],
2447 ["cf::object::player" => qw(player)], 3055 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 3056 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 3057 ["cf::map" => qw(trigger)],
2450) { 3058) {
2451 no strict 'refs'; 3059 no strict 'refs';
… …
2527# the server's init and main functions 3135# the server's init and main functions
2528 3136
2529sub load_facedata($) { 3137sub load_facedata($) {
2530 my ($path) = @_; 3138 my ($path) = @_;
2531 3139
3140 # HACK to clear player env face cache, we need some signal framework
3141 # for this (global event?)
3142 %ext::player_env::MUSIC_FACE_CACHE = ();
3143
3144 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3145
2532 warn "loading facedata from $path\n"; 3146 warn "loading facedata from $path\n";
2533 3147
2534 my $facedata; 3148 my $facedata;
2535 0 < aio_load $path, $facedata 3149 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 3150 or die "$path: $!";
… …
2538 $facedata = Coro::Storable::thaw $facedata; 3152 $facedata = Coro::Storable::thaw $facedata;
2539 3153
2540 $facedata->{version} == 2 3154 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 3155 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 3156
3157 # patch in the exptable
3158 $facedata->{resource}{"res/exp_table"} = {
3159 type => FT_RSRC,
3160 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3161 };
3162 cf::cede_to_tick;
3163
2543 { 3164 {
2544 my $faces = $facedata->{faceinfo}; 3165 my $faces = $facedata->{faceinfo};
2545 3166
2546 while (my ($face, $info) = each %$faces) { 3167 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3168 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3169
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3170 cf::face::set_visibility $idx, $info->{visibility};
3171 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3172 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3173 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 3174
3175 cf::cede_to_tick;
2552 } 3176 }
2553 3177
2554 while (my ($face, $info) = each %$faces) { 3178 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 3179 next unless $info->{smooth};
3180
2556 my $idx = cf::face::find $face 3181 my $idx = cf::face::find $face
2557 or next; 3182 or next;
3183
2558 if (my $smooth = cf::face::find $info->{smooth}) { 3184 if (my $smooth = cf::face::find $info->{smooth}) {
3185 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3186 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 3187 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3188 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 3189 }
2563 Coro::cede; 3190
3191 cf::cede_to_tick;
2564 } 3192 }
2565 } 3193 }
2566 3194
2567 { 3195 {
2568 my $anims = $facedata->{animinfo}; 3196 my $anims = $facedata->{animinfo};
2569 3197
2570 while (my ($anim, $info) = each %$anims) { 3198 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3199 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 3200 cf::cede_to_tick;
2573 } 3201 }
2574 3202
2575 cf::anim::invalidate_all; # d'oh 3203 cf::anim::invalidate_all; # d'oh
2576 } 3204 }
2577 3205
3206 {
3207 # TODO: for gcfclient pleasure, we should give resources
3208 # that gcfclient doesn't grok a >10000 face index.
3209 my $res = $facedata->{resource};
3210
3211 while (my ($name, $info) = each %$res) {
3212 if (defined $info->{type}) {
3213 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3214 my $data;
3215
3216 if ($info->{type} & 1) {
3217 # prepend meta info
3218
3219 my $meta = $enc->encode ({
3220 name => $name,
3221 %{ $info->{meta} || {} },
3222 });
3223
3224 $data = pack "(w/a*)*", $meta, $info->{data};
3225 } else {
3226 $data = $info->{data};
3227 }
3228
3229 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3230 cf::face::set_type $idx, $info->{type};
3231 } else {
3232 $RESOURCE{$name} = $info;
3233 }
3234
3235 cf::cede_to_tick;
3236 }
3237 }
3238
3239 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3240
2578 1 3241 1
2579} 3242}
2580 3243
3244cf::global->attach (on_resource_update => sub {
3245 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3246 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3247
3248 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3249 my $sound = $soundconf->{compat}[$_]
3250 or next;
3251
3252 my $face = cf::face::find "sound/$sound->[1]";
3253 cf::sound::set $sound->[0] => $face;
3254 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3255 }
3256
3257 while (my ($k, $v) = each %{$soundconf->{event}}) {
3258 my $face = cf::face::find "sound/$v";
3259 cf::sound::set $k => $face;
3260 }
3261 }
3262});
3263
3264register_exticmd fx_want => sub {
3265 my ($ns, $want) = @_;
3266
3267 while (my ($k, $v) = each %$want) {
3268 $ns->fx_want ($k, $v);
3269 }
3270};
3271
3272sub load_resource_file($) {
3273 my $guard = lock_acquire "load_resource_file";
3274
3275 my $status = load_resource_file_ $_[0];
3276 get_slot 0.1, 100;
3277 cf::arch::commit_load;
3278
3279 $status
3280}
3281
2581sub reload_regions { 3282sub reload_regions {
3283 # HACK to clear player env face cache, we need some signal framework
3284 # for this (global event?)
3285 %ext::player_env::MUSIC_FACE_CACHE = ();
3286
2582 load_resource_file "$MAPDIR/regions" 3287 load_resource_file "$MAPDIR/regions"
2583 or die "unable to load regions file\n"; 3288 or die "unable to load regions file\n";
3289
3290 for (cf::region::list) {
3291 $_->{match} = qr/$_->{match}/
3292 if exists $_->{match};
3293 }
2584} 3294}
2585 3295
2586sub reload_facedata { 3296sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3297 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3298 or die "unable to load facedata\n";
… …
2599} 3309}
2600 3310
2601sub reload_resources { 3311sub reload_resources {
2602 warn "reloading resource files...\n"; 3312 warn "reloading resource files...\n";
2603 3313
3314 reload_facedata;
3315 reload_archetypes;
2604 reload_regions; 3316 reload_regions;
2605 reload_facedata;
2606 #reload_archetypes;#d#
2607 reload_archetypes;
2608 reload_treasures; 3317 reload_treasures;
2609 3318
2610 warn "finished reloading resource files\n"; 3319 warn "finished reloading resource files\n";
2611} 3320}
2612 3321
2613sub init { 3322sub reload_config {
2614 reload_resources;
2615}
2616
2617sub cfg_load {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3323 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3324 or return;
2620 3325
2621 local $/; 3326 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3327 *CFG = YAML::Load <$fh>;
2623 3328
2624 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3329 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2625 3330
2626 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3331 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2627 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3332 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2633 }; 3338 };
2634 warn $@ if $@; 3339 warn $@ if $@;
2635 } 3340 }
2636} 3341}
2637 3342
3343sub pidfile() {
3344 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3345 or die "$PIDFILE: $!";
3346 flock $fh, &Fcntl::LOCK_EX
3347 or die "$PIDFILE: flock: $!";
3348 $fh
3349}
3350
3351# make sure only one server instance is running at any one time
3352sub atomic {
3353 my $fh = pidfile;
3354
3355 my $pid = <$fh>;
3356 kill 9, $pid if $pid > 0;
3357
3358 seek $fh, 0, 0;
3359 print $fh $$;
3360}
3361
2638sub main { 3362sub main {
3363 cf::init_globals; # initialise logging
3364
3365 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3366 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3367 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3368 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3369
3370 cf::init_experience;
3371 cf::init_anim;
3372 cf::init_attackmess;
3373 cf::init_dynamic;
3374
3375 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3376
2639 # we must not ever block the main coroutine 3377 # we must not ever block the main coroutine
2640 local $Coro::idle = sub { 3378 local $Coro::idle = sub {
2641 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3379 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2642 (async { 3380 (async {
2643 Event::one_event; 3381 $Coro::current->{desc} = "IDLE BUG HANDLER";
3382 EV::loop EV::LOOP_ONESHOT;
2644 })->prio (Coro::PRIO_MAX); 3383 })->prio (Coro::PRIO_MAX);
2645 }; 3384 };
2646 3385
2647 cfg_load; 3386 evthread_start IO::AIO::poll_fileno;
3387
3388 cf::sync_job {
3389 reload_resources;
3390 reload_config;
2648 db_init; 3391 db_init;
3392
3393 cf::load_settings;
3394 cf::load_materials;
3395 cf::init_uuid;
3396 cf::init_signals;
3397 cf::init_commands;
3398 cf::init_skills;
3399
3400 cf::init_beforeplay;
3401
3402 atomic;
3403
2649 load_extensions; 3404 load_extensions;
2650 3405
2651 $TICK_WATCHER->start; 3406 utime time, time, $RUNTIMEFILE;
3407
3408 # no (long-running) fork's whatsoever before this point(!)
3409 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3410
3411 (pop @POST_INIT)->(0) while @POST_INIT;
3412 };
3413
2652 Event::loop; 3414 EV::loop;
2653} 3415}
2654 3416
2655############################################################################# 3417#############################################################################
2656# initialisation and cleanup 3418# initialisation and cleanup
2657 3419
2658# install some emergency cleanup handlers 3420# install some emergency cleanup handlers
2659BEGIN { 3421BEGIN {
3422 our %SIGWATCHER = ();
2660 for my $signal (qw(INT HUP TERM)) { 3423 for my $signal (qw(INT HUP TERM)) {
2661 Event->signal ( 3424 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2662 reentrant => 0,
2663 data => WF_AUTOCANCEL,
2664 signal => $signal,
2665 prio => 0,
2666 cb => sub {
2667 cf::cleanup "SIG$signal"; 3425 cf::cleanup "SIG$signal";
2668 },
2669 ); 3426 };
2670 } 3427 }
2671} 3428}
2672 3429
2673sub write_runtime { 3430sub write_runtime_sync {
2674 my $runtime = "$LOCALDIR/runtime";
2675
2676 # first touch the runtime file to show we are still running: 3431 # first touch the runtime file to show we are still running:
2677 # the fsync below can take a very very long time. 3432 # the fsync below can take a very very long time.
2678 3433
2679 IO::AIO::aio_utime $runtime, undef, undef; 3434 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2680 3435
2681 my $guard = cf::lock_acquire "write_runtime"; 3436 my $guard = cf::lock_acquire "write_runtime";
2682 3437
2683 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3438 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2684 or return; 3439 or return;
2685 3440
2686 my $value = $cf::RUNTIME + 90 + 10; 3441 my $value = $cf::RUNTIME + 90 + 10;
2687 # 10 is the runtime save interval, for a monotonic clock 3442 # 10 is the runtime save interval, for a monotonic clock
2688 # 60 allows for the watchdog to kill the server. 3443 # 60 allows for the watchdog to kill the server.
… …
2698 aio_utime $fh, undef, undef; 3453 aio_utime $fh, undef, undef;
2699 3454
2700 close $fh 3455 close $fh
2701 or return; 3456 or return;
2702 3457
2703 aio_rename "$runtime~", $runtime 3458 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2704 and return; 3459 and return;
2705 3460
2706 warn "runtime file written.\n"; 3461 warn "runtime file written.\n";
2707 3462
2708 1 3463 1
3464}
3465
3466our $uuid_lock;
3467our $uuid_skip;
3468
3469sub write_uuid_sync($) {
3470 $uuid_skip ||= $_[0];
3471
3472 return if $uuid_lock;
3473 local $uuid_lock = 1;
3474
3475 my $uuid = "$LOCALDIR/uuid";
3476
3477 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3478 or return;
3479
3480 my $value = uuid_seq uuid_cur;
3481
3482 unless ($value) {
3483 warn "cowardly refusing to write zero uuid value!\n";
3484 return;
3485 }
3486
3487 my $value = uuid_str $value + $uuid_skip;
3488 $uuid_skip = 0;
3489
3490 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3491 and return;
3492
3493 # always fsync - this file is important
3494 aio_fsync $fh
3495 and return;
3496
3497 close $fh
3498 or return;
3499
3500 aio_rename "$uuid~", $uuid
3501 and return;
3502
3503 warn "uuid file written ($value).\n";
3504
3505 1
3506
3507}
3508
3509sub write_uuid($$) {
3510 my ($skip, $sync) = @_;
3511
3512 $sync ? write_uuid_sync $skip
3513 : async { write_uuid_sync $skip };
2709} 3514}
2710 3515
2711sub emergency_save() { 3516sub emergency_save() {
2712 my $freeze_guard = cf::freeze_mainloop; 3517 my $freeze_guard = cf::freeze_mainloop;
2713 3518
2714 warn "enter emergency perl save\n"; 3519 warn "emergency_perl_save: enter\n";
2715 3520
2716 cf::sync_job { 3521 cf::sync_job {
3522 # this is a trade-off: we want to be very quick here, so
3523 # save all maps without fsync, and later call a global sync
3524 # (which in turn might be very very slow)
3525 local $USE_FSYNC = 0;
3526
2717 # use a peculiar iteration method to avoid tripping on perl 3527 # use a peculiar iteration method to avoid tripping on perl
2718 # refcount bugs in for. also avoids problems with players 3528 # refcount bugs in for. also avoids problems with players
2719 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
2720 warn "begin emergency player save\n"; 3530 warn "emergency_perl_save: begin player save\n";
2721 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
2722 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
2723 $pl->valid or next; 3533 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724 $pl->save; 3535 $pl->save;
2725 } 3536 }
2726 warn "end emergency player save\n"; 3537 warn "emergency_perl_save: end player save\n";
2727 3538
2728 warn "begin emergency map save\n"; 3539 warn "emergency_perl_save: begin map save\n";
2729 for my $path (keys %cf::MAP) { 3540 for my $path (keys %cf::MAP) {
2730 my $map = $cf::MAP{$path} or next; 3541 my $map = $cf::MAP{$path} or next;
2731 $map->valid or next; 3542 $map->valid or next;
2732 $map->save; 3543 $map->save;
2733 } 3544 }
2734 warn "end emergency map save\n"; 3545 warn "emergency_perl_save: end map save\n";
2735 3546
2736 warn "begin emergency database checkpoint\n"; 3547 warn "emergency_perl_save: begin database checkpoint\n";
2737 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
2738 warn "end emergency database checkpoint\n"; 3549 warn "emergency_perl_save: end database checkpoint\n";
3550
3551 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1;
3553 warn "emergency_perl_save: end write uuid\n";
2739 }; 3554 };
2740 3555
3556 warn "emergency_perl_save: starting sync()\n";
3557 IO::AIO::aio_sync sub {
3558 warn "emergency_perl_save: finished sync()\n";
3559 };
3560
2741 warn "leave emergency perl save\n"; 3561 warn "emergency_perl_save: leave\n";
2742} 3562}
2743 3563
2744sub post_cleanup { 3564sub post_cleanup {
2745 my ($make_core) = @_; 3565 my ($make_core) = @_;
2746 3566
2747 warn Carp::longmess "post_cleanup backtrace" 3567 warn Carp::longmess "post_cleanup backtrace"
2748 if $make_core; 3568 if $make_core;
3569
3570 my $fh = pidfile;
3571 unlink $PIDFILE if <$fh> == $$;
3572}
3573
3574# a safer delete_package, copied from Symbol
3575sub clear_package($) {
3576 my $pkg = shift;
3577
3578 # expand to full symbol table name if needed
3579 unless ($pkg =~ /^main::.*::$/) {
3580 $pkg = "main$pkg" if $pkg =~ /^::/;
3581 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3582 $pkg .= '::' unless $pkg =~ /::$/;
3583 }
3584
3585 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3586 my $stem_symtab = *{$stem}{HASH};
3587
3588 defined $stem_symtab and exists $stem_symtab->{$leaf}
3589 or return;
3590
3591 # clear all symbols
3592 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3593 for my $name (keys %$leaf_symtab) {
3594 _gv_clear *{"$pkg$name"};
3595# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3596 }
3597 warn "cleared package $pkg\n";#d#
2749} 3598}
2750 3599
2751sub do_reload_perl() { 3600sub do_reload_perl() {
2752 # can/must only be called in main 3601 # can/must only be called in main
2753 if ($Coro::current != $Coro::main) { 3602 if ($Coro::current != $Coro::main) {
2754 warn "can only reload from main coroutine"; 3603 warn "can only reload from main coroutine";
2755 return; 3604 return;
2756 } 3605 }
2757 3606
3607 return if $RELOAD++;
3608
3609 my $t1 = EV::time;
3610
3611 while ($RELOAD) {
2758 warn "reloading..."; 3612 warn "reloading...";
2759 3613
2760 warn "entering sync_job"; 3614 warn "entering sync_job";
2761 3615
2762 cf::sync_job { 3616 cf::sync_job {
2763 cf::write_runtime; # external watchdog should not bark 3617 cf::write_runtime_sync; # external watchdog should not bark
2764 cf::emergency_save; 3618 cf::emergency_save;
2765 cf::write_runtime; # external watchdog should not bark 3619 cf::write_runtime_sync; # external watchdog should not bark
2766 3620
2767 warn "syncing database to disk"; 3621 warn "syncing database to disk";
2768 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
2769 3623
2770 # if anything goes wrong in here, we should simply crash as we already saved 3624 # if anything goes wrong in here, we should simply crash as we already saved
2771 3625
2772 warn "cancelling all WF_AUTOCANCEL watchers";
2773 for (Event::all_watchers) {
2774 $_->cancel if $_->data & WF_AUTOCANCEL;
2775 }
2776
2777 warn "flushing outstanding aio requests"; 3626 warn "flushing outstanding aio requests";
2778 for (;;) {
2779 BDB::flush;
2780 IO::AIO::flush;
2781 Coro::cede;
2782 last unless IO::AIO::nreqs || BDB::nreqs; 3627 while (IO::AIO::nreqs || BDB::nreqs) {
2783 warn "iterate..."; 3628 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2784 }
2785
2786 ++$RELOAD;
2787
2788 warn "cancelling all extension coros";
2789 $_->cancel for values %EXT_CORO;
2790 %EXT_CORO = ();
2791
2792 warn "removing commands";
2793 %COMMAND = ();
2794
2795 warn "removing ext commands";
2796 %EXTCMD = ();
2797
2798 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg";
2801
2802 if (my $cb = $pkg->can ("unload")) {
2803 eval {
2804 $cb->($pkg);
2805 1
2806 } or warn "$pkg unloaded, but with errors: $@";
2807 } 3629 }
2808 3630
2809 warn "... nuking $pkg"; 3631 warn "cancelling all extension coros";
2810 Symbol::delete_package $pkg; 3632 $_->cancel for values %EXT_CORO;
2811 } 3633 %EXT_CORO = ();
2812 3634
2813 warn "unloading all perl modules loaded from $LIBDIR"; 3635 warn "removing commands";
2814 while (my ($k, $v) = each %INC) { 3636 %COMMAND = ();
2815 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2816 3637
3638 warn "removing ext/exti commands";
3639 %EXTCMD = ();
3640 %EXTICMD = ();
3641
3642 warn "unloading/nuking all extensions";
3643 for my $pkg (@EXTS) {
2817 warn "... unloading $k"; 3644 warn "... unloading $pkg";
2818 delete $INC{$k};
2819 3645
2820 $k =~ s/\.pm$//;
2821 $k =~ s/\//::/g;
2822
2823 if (my $cb = $k->can ("unload_module")) { 3646 if (my $cb = $pkg->can ("unload")) {
3647 eval {
2824 $cb->(); 3648 $cb->($pkg);
3649 1
3650 } or warn "$pkg unloaded, but with errors: $@";
3651 }
3652
3653 warn "... clearing $pkg";
3654 clear_package $pkg;
2825 } 3655 }
2826 3656
2827 Symbol::delete_package $k; 3657 warn "unloading all perl modules loaded from $LIBDIR";
3658 while (my ($k, $v) = each %INC) {
3659 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3660
3661 warn "... unloading $k";
3662 delete $INC{$k};
3663
3664 $k =~ s/\.pm$//;
3665 $k =~ s/\//::/g;
3666
3667 if (my $cb = $k->can ("unload_module")) {
3668 $cb->();
3669 }
3670
3671 clear_package $k;
2828 } 3672 }
2829 3673
2830 warn "getting rid of safe::, as good as possible"; 3674 warn "getting rid of safe::, as good as possible";
2831 Symbol::delete_package "safe::$_" 3675 clear_package "safe::$_"
2832 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3676 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2833 3677
2834 warn "unloading cf.pm \"a bit\""; 3678 warn "unloading cf.pm \"a bit\"";
2835 delete $INC{"cf.pm"}; 3679 delete $INC{"cf.pm"};
2836 delete $INC{"cf/pod.pm"}; 3680 delete $INC{"cf/pod.pm"};
2837 3681
2838 # don't, removes xs symbols, too, 3682 # don't, removes xs symbols, too,
2839 # and global variables created in xs 3683 # and global variables created in xs
2840 #Symbol::delete_package __PACKAGE__; 3684 #clear_package __PACKAGE__;
2841 3685
2842 warn "unload completed, starting to reload now"; 3686 warn "unload completed, starting to reload now";
2843 3687
2844 warn "reloading cf.pm"; 3688 warn "reloading cf.pm";
2845 require cf; 3689 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3690 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847 3691
2848 warn "loading config and database again"; 3692 warn "loading config and database again";
2849 cf::cfg_load; 3693 cf::reload_config;
2850 3694
2851 warn "loading extensions"; 3695 warn "loading extensions";
2852 cf::load_extensions; 3696 cf::load_extensions;
2853 3697
3698 if ($REATTACH_ON_RELOAD) {
2854 warn "reattaching attachments to objects/players"; 3699 warn "reattaching attachments to objects/players";
2855 _global_reattach; # objects, sockets 3700 _global_reattach; # objects, sockets
2856 warn "reattaching attachments to maps"; 3701 warn "reattaching attachments to maps";
2857 reattach $_ for values %MAP; 3702 reattach $_ for values %MAP;
2858 warn "reattaching attachments to players"; 3703 warn "reattaching attachments to players";
2859 reattach $_ for values %PLAYER; 3704 reattach $_ for values %PLAYER;
3705 }
2860 3706
3707 warn "running post_init jobs";
3708 (pop @POST_INIT)->(1) while @POST_INIT;
3709
2861 warn "leaving sync_job"; 3710 warn "leaving sync_job";
2862 3711
2863 1 3712 1
2864 } or do { 3713 } or do {
2865 warn $@; 3714 warn $@;
2866 warn "error while reloading, exiting."; 3715 cf::cleanup "error while reloading, exiting.";
2867 exit 1;
2868 }; 3716 };
2869 3717
2870 warn "reloaded"; 3718 warn "reloaded";
3719 --$RELOAD;
3720 }
3721
3722 $t1 = EV::time - $t1;
3723 warn "reload completed in ${t1}s\n";
2871}; 3724};
2872 3725
2873our $RELOAD_WATCHER; # used only during reload 3726our $RELOAD_WATCHER; # used only during reload
2874 3727
2875sub reload_perl() { 3728sub reload_perl() {
2876 # doing reload synchronously and two reloads happen back-to-back, 3729 # doing reload synchronously and two reloads happen back-to-back,
2877 # coro crashes during coro_state_free->destroy here. 3730 # coro crashes during coro_state_free->destroy here.
2878 3731
2879 $RELOAD_WATCHER ||= Event->timer ( 3732 $RELOAD_WATCHER ||= cf::async {
2880 reentrant => 0, 3733 Coro::AIO::aio_wait cache_extensions;
2881 after => 0, 3734
2882 data => WF_AUTOCANCEL, 3735 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
2883 cb => sub {
2884 do_reload_perl; 3736 do_reload_perl;
2885 undef $RELOAD_WATCHER; 3737 undef $RELOAD_WATCHER;
2886 }, 3738 };
2887 ); 3739 };
2888} 3740}
2889 3741
2890register_command "reload" => sub { 3742register_command "reload" => sub {
2891 my ($who, $arg) = @_; 3743 my ($who, $arg) = @_;
2892 3744
2893 if ($who->flag (FLAG_WIZ)) { 3745 if ($who->flag (FLAG_WIZ)) {
2894 $who->message ("reloading server."); 3746 $who->message ("reloading server.");
3747 async {
3748 $Coro::current->{desc} = "perl_reload";
2895 async { reload_perl }; 3749 reload_perl;
3750 };
2896 } 3751 }
2897}; 3752};
2898 3753
2899unshift @INC, $LIBDIR; 3754unshift @INC, $LIBDIR;
2900 3755
… …
2902 3757
2903our @WAIT_FOR_TICK; 3758our @WAIT_FOR_TICK;
2904our @WAIT_FOR_TICK_BEGIN; 3759our @WAIT_FOR_TICK_BEGIN;
2905 3760
2906sub wait_for_tick { 3761sub wait_for_tick {
2907 return unless $TICK_WATCHER->is_active;
2908 return if $Coro::current == $Coro::main; 3762 return if tick_inhibit || $Coro::current == $Coro::main;
2909 3763
2910 my $signal = new Coro::Signal; 3764 my $signal = new Coro::Signal;
2911 push @WAIT_FOR_TICK, $signal; 3765 push @WAIT_FOR_TICK, $signal;
2912 $signal->wait; 3766 $signal->wait;
2913} 3767}
2914 3768
2915sub wait_for_tick_begin { 3769sub wait_for_tick_begin {
2916 return unless $TICK_WATCHER->is_active;
2917 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
2918 3771
2919 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
2920 push @WAIT_FOR_TICK_BEGIN, $signal; 3773 push @WAIT_FOR_TICK_BEGIN, $signal;
2921 $signal->wait; 3774 $signal->wait;
2922} 3775}
2923 3776
2924 my $min = 1e6;#d# 3777sub tick {
2925 my $avg = 10;
2926$TICK_WATCHER = Event->timer (
2927 reentrant => 0,
2928 parked => 1,
2929 prio => 0,
2930 at => $NEXT_TICK || $TICK,
2931 data => WF_AUTOCANCEL,
2932 cb => sub {
2933 if ($Coro::current != $Coro::main) { 3778 if ($Coro::current != $Coro::main) {
2934 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3779 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2935 unless ++$bug_warning > 10; 3780 unless ++$bug_warning > 10;
2936 return; 3781 return;
2937 } 3782 }
2938 3783
2939 $NOW = $tick_start = Event::time;
2940
2941 cf::server_tick; # one server iteration 3784 cf::server_tick; # one server iteration
2942 3785
2943 0 && sync_job {#d# 3786 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2944 for(1..10) { 3787 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2945 my $t = Event::time; 3788 Coro::async_pool {
2946 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3789 $Coro::current->{desc} = "runtime saver";
2947 or die; 3790 write_runtime_sync
2948 3791 or warn "ERROR: unable to write runtime file: $!";
2949 $map->width (50);
2950 $map->height (50);
2951 $map->alloc;
2952 $map->_load_objects ("/tmp/x.map", 1);
2953 my $t = Event::time - $t;
2954
2955 #next unless $t < 0.0013;#d#
2956 if ($t < $min) {
2957 $min = $t;
2958 }
2959 $avg = $avg * 0.99 + $t * 0.01;
2960 }
2961 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962 exit 0;
2963 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964 }; 3792 };
3793 }
2965 3794
2966 $RUNTIME += $TICK;
2967 $NEXT_TICK += $TICK;
2968
2969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970 $NEXT_RUNTIME_WRITE = $NOW + 10;
2971 Coro::async_pool {
2972 write_runtime
2973 or warn "ERROR: unable to write runtime file: $!";
2974 };
2975 }
2976
2977# my $AFTER = Event::time;
2978# warn $AFTER - $NOW;#d#
2979
2980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3795 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981 $sig->send; 3796 $sig->send;
2982 } 3797 }
2983 while (my $sig = shift @WAIT_FOR_TICK) { 3798 while (my $sig = shift @WAIT_FOR_TICK) {
2984 $sig->send; 3799 $sig->send;
2985 } 3800 }
2986 3801
2987 $NOW = Event::time; 3802 $LOAD = ($NOW - $TICK_START) / $TICK;
2988
2989 # if we are delayed by four ticks or more, skip them all
2990 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2991
2992 $TICK_WATCHER->at ($NEXT_TICK);
2993 $TICK_WATCHER->start;
2994
2995 $LOAD = ($NOW - $tick_start) / $TICK;
2996 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3803 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997 3804
2998 _post_tick; 3805 if (0) {
2999 3806 if ($NEXT_TICK) {
3000 3807 my $jitter = $TICK_START - $NEXT_TICK;
3808 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3809 warn "jitter $JITTER\n";#d#
3810 }
3001 }, 3811 }
3002); 3812}
3003 3813
3004{ 3814{
3005 BDB::max_poll_time $TICK * 0.1; 3815 # configure BDB
3006 $BDB_POLL_WATCHER = Event->io ( 3816
3007 reentrant => 0,
3008 fd => BDB::poll_fileno,
3009 poll => 'r',
3010 prio => 0,
3011 data => WF_AUTOCANCEL,
3012 cb => \&BDB::poll_cb,
3013 );
3014 BDB::min_parallel 8; 3817 BDB::min_parallel 8;
3015 3818 BDB::max_poll_reqs $TICK * 0.1;
3016 BDB::set_sync_prepare { 3819 $AnyEvent::BDB::WATCHER->priority (1);
3017 my $status;
3018 my $current = $Coro::current;
3019 (
3020 sub {
3021 $status = $!;
3022 $current->ready; undef $current;
3023 },
3024 sub {
3025 Coro::schedule while defined $current;
3026 $! = $status;
3027 },
3028 )
3029 };
3030 3820
3031 unless ($DB_ENV) { 3821 unless ($DB_ENV) {
3032 $DB_ENV = BDB::db_env_create; 3822 $DB_ENV = BDB::db_env_create;
3823 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3824 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3825 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3826 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3827 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3033 3828
3034 cf::sync_job { 3829 cf::sync_job {
3035 eval { 3830 eval {
3036 BDB::db_env_open 3831 BDB::db_env_open
3037 $DB_ENV, 3832 $DB_ENV,
… …
3039 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3834 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3040 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3835 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041 0666; 3836 0666;
3042 3837
3043 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3838 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046 $DB_ENV->set_lk_detect;
3047 }; 3839 };
3048 3840
3049 cf::cleanup "db_env_open(db): $@" if $@; 3841 cf::cleanup "db_env_open(db): $@" if $@;
3050 }; 3842 };
3051 } 3843 }
3844
3845 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3846 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3847 };
3848 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3849 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3850 };
3851 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3852 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3853 };
3052} 3854}
3053 3855
3054{ 3856{
3857 # configure IO::AIO
3858
3055 IO::AIO::min_parallel 8; 3859 IO::AIO::min_parallel 8;
3056
3057 undef $Coro::AIO::WATCHER;
3058 IO::AIO::max_poll_time $TICK * 0.1; 3860 IO::AIO::max_poll_time $TICK * 0.1;
3059 $AIO_POLL_WATCHER = Event->io ( 3861 undef $AnyEvent::AIO::WATCHER;
3060 reentrant => 0,
3061 data => WF_AUTOCANCEL,
3062 fd => IO::AIO::poll_fileno,
3063 poll => 'r',
3064 prio => 6,
3065 cb => \&IO::AIO::poll_cb,
3066 );
3067} 3862}
3068 3863
3069my $_log_backtrace; 3864my $_log_backtrace;
3070 3865
3071sub _log_backtrace { 3866sub _log_backtrace {
… …
3074 $msg =~ s/\n//; 3869 $msg =~ s/\n//;
3075 3870
3076 # limit the # of concurrent backtraces 3871 # limit the # of concurrent backtraces
3077 if ($_log_backtrace < 2) { 3872 if ($_log_backtrace < 2) {
3078 ++$_log_backtrace; 3873 ++$_log_backtrace;
3874 my $perl_bt = Carp::longmess $msg;
3079 async { 3875 async {
3876 $Coro::current->{desc} = "abt $msg";
3877
3080 my @bt = fork_call { 3878 my @bt = fork_call {
3081 @addr = map { sprintf "%x", $_ } @addr; 3879 @addr = map { sprintf "%x", $_ } @addr;
3082 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3880 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3881 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3084 or die "addr2line: $!"; 3882 or die "addr2line: $!";
… …
3092 } 3890 }
3093 3891
3094 @funcs 3892 @funcs
3095 }; 3893 };
3096 3894
3097 LOG llevInfo, "[ABT] $msg\n"; 3895 LOG llevInfo, "[ABT] $perl_bt\n";
3896 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3098 LOG llevInfo, "[ABT] $_\n" for @bt; 3897 LOG llevInfo, "[ABT] $_\n" for @bt;
3099 --$_log_backtrace; 3898 --$_log_backtrace;
3100 }; 3899 };
3101 } else { 3900 } else {
3102 LOG llevInfo, "[ABT] $msg\n"; 3901 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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