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.290 by root, Mon Jul 2 03:15:30 2007 UTC vs.
Revision 1.465 by root, Thu Jan 8 00:54:55 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
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5; 56use Digest::MD5;
29use Fcntl; 57use Fcntl;
30use YAML::Syck (); 58use YAML ();
31use IO::AIO 2.32 (); 59use IO::AIO ();
32use Time::HiRes; 60use Time::HiRes;
33use Compress::LZF; 61use Compress::LZF;
62use Digest::MD5 ();
63
64AnyEvent::detect;
34 65
35# configure various modules to our taste 66# configure various modules to our taste
36# 67#
37$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
38Coro::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";
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 76
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 78
50our %COMMAND = (); 79our %COMMAND = ();
51our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
54our %EXTCMD = (); 83our %EXTCMD = ();
55our %EXTICMD = (); 84our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
58 87
59our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 89our @EVENT;
61 90
62our $CONFDIR = confdir; 91our $CONFDIR = confdir;
63our $DATADIR = datadir; 92our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
73 106
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 109our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
81 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 115our $DB_ENV;
84 116
85our %CFG; 117our %CFG;
86 118
87our $UPTIME; $UPTIME ||= time; 119our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 120our $RUNTIME;
121our $NOW;
89 122
90our %PLAYER; # all users 123our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 124our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 125our $LINK_MAP; # the special {link} map, which is always available
93 126
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 128our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 129
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
132our $JITTER; # average jitter
99our $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)
100 138
101binmode STDOUT; 139binmode STDOUT;
102binmode STDERR; 140binmode STDERR;
103 141
104# read virtual server time, if available 142# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
109} 147}
110 148
111mkdir $_ 149mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
157 195
158The raw value load value from the last tick. 196The raw value load value from the last tick.
159 197
160=item %cf::CFG 198=item %cf::CFG
161 199
162Configuration for the server, loaded from C</etc/crossfire/config>, or 200Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 201from wherever your confdir points to.
164 202
165=item cf::wait_for_tick, cf::wait_for_tick_begin 203=item cf::wait_for_tick, cf::wait_for_tick_begin
166 204
167These 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
168returns 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
169per 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.
170 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
171=back 215=back
172 216
173=cut 217=cut
174 218
175BEGIN { 219BEGIN {
… …
179 $msg .= "\n" 223 $msg .= "\n"
180 unless $msg =~ /\n$/; 224 unless $msg =~ /\n$/;
181 225
182 $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;
183 227
184 utf8::encode $msg;
185 LOG llevError, $msg; 228 LOG llevError, $msg;
186 }; 229 };
187} 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#?
188 246
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
199for my $pkg (qw( 257for my $pkg (qw(
200 cf::global cf::attachable 258 cf::global cf::attachable
201 cf::object cf::object::player 259 cf::object cf::object::player
202 cf::client cf::player 260 cf::client cf::player
203 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
204 cf::map cf::party cf::region 263 cf::party cf::region
205)) { 264)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 266}
209 267
210$Event::DIED = sub { 268$EV::DIED = sub {
211 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
212}; 270};
213 271
214############################################################################# 272#############################################################################
215 273
… …
238 $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;
239 $d 297 $d
240 } || "[unable to dump $_[0]: '$@']"; 298 } || "[unable to dump $_[0]: '$@']";
241} 299}
242 300
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
251=cut 309=cut
252 310
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 312
255sub to_json ($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[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}
257 329
258=item cf::lock_wait $string 330=item cf::lock_wait $string
259 331
260Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
261 333
262=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
263 335
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
267returned. 339returned.
268 340
341Locks are *not* recursive, locking from the same coro twice results in a
342deadlocked coro.
343
269Lock 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
270uses map_find and cf::map::load uses map_load). 345uses map_find and cf::map::load uses map_load).
271 346
272=item $locked = cf::lock_active $string 347=item $locked = cf::lock_active $string
273 348
274Return 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.
275 350
276=cut 351=cut
277 352
278our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
279 354
280sub lock_wait($) { 355sub lock_wait($) {
281 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
282
283 # wait for lock, if any
284 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule;
287 }
288} 357}
289 358
290sub lock_acquire($) { 359sub lock_acquire($) {
291 my ($key) = @_; 360 $LOCKS->guard ($_[0])
292
293 # wait, to be sure we are not locked
294 lock_wait $key;
295
296 $LOCK{$key} = [];
297
298 Coro::guard {
299 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} };
301 }
302} 361}
303 362
304sub lock_active($) { 363sub lock_active($) {
305 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
306
307 ! ! $LOCK{$key}
308} 365}
309 366
310sub freeze_mainloop { 367sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
312 369
313 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
314 $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 }
315 }; 431 }
316 $TICK_WATCHER->stop; 432};
317 $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;
318} 446}
319 447
320=item cf::async { BLOCK } 448=item cf::async { BLOCK }
321 449
322Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
… …
327 455
328BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
329 457
330=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
331 459
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
334partly 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
335acceptable. 463acceptable.
336 464
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
… …
343 471
344sub sync_job(&) { 472sub sync_job(&) {
345 my ($job) = @_; 473 my ($job) = @_;
346 474
347 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 476 my $time = EV::time;
349 477
350 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
352 480
353 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 482
355 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
356 484
357 my $busy = 1; 485 my $busy = 1;
358 my @res; 486 my @res;
359 487
360 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 490 @res = eval { $job->() };
362 warn $@ if $@; 491 warn $@ if $@;
363 undef $busy; 492 undef $busy;
364 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
365 494
366 while ($busy) { 495 while ($busy) {
367 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
368 } 500 }
501 }
369 502
370 $time = Event::time - $time; 503 my $time = EV::time - $time;
371 504
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
376 506
377 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
378 } else { 508 } else {
379 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
380 510
… …
405=item fork_call { }, $args 535=item fork_call { }, $args
406 536
407Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
411 541
412=cut 542=cut
413 543
414sub fork_call(&@) { 544sub fork_call(&@) {
415 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
416 546
417# 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,
418# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 550
422 if (my $pid = fork) { 551 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 552 reset_signals;
435 local $SIG{__WARN__}; 553 &$cb
436 local $SIG{__DIE__}; 554 }, @args;
437 eval {
438 close $fh1;
439 555
440 my @res = eval { $cb->(@args) }; 556 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 557}
442 };
443 558
444 warn $@ if $@; 559=item $coin = coin_from_name $name
445 _exit 0; 560
446 } 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
447} 584}
448 585
449=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
450 587
451Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
453=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
454 591
455Stores 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
456data 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).
457 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
458=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}
459 618
460our $DB; 619our $DB;
461 620
462sub db_init { 621sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 622 cf::sync_job {
467 eval { 623 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 624 };
477} 625}
478 626
479sub db_get($$) { 627sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
481 629
… …
531 if (1) { 679 if (1) {
532 $md5 = 680 $md5 =
533 join "\x00", 681 join "\x00",
534 $processversion, 682 $processversion,
535 map { 683 map {
536 Coro::cede; 684 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 686 } 0.. $#$src;
539 687
540 688
541 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
… …
579 727
580############################################################################# 728#############################################################################
581 729
582=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
583 731
584Many 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
585attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
587 735
588In 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>
589C<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
590Crossfire TRT). 738Deliantra).
591 739
592=over 4 740=over 4
593 741
594=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
595 743
… …
639=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
640 788
641Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
642given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
643 791
644Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
645that 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.
646 794
647These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
648 796
649=over 4 797=over 4
… …
847 "; 995 ";
848 die if $@; 996 die if $@;
849} 997}
850 998
851our $override; 999our $override;
852our @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?
853 1001
854sub override { 1002sub override {
855 $override = 1; 1003 $override = 1;
856 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
857} 1005}
858 1006
859sub do_invoke { 1007sub do_invoke {
860 my $event = shift; 1008 my $event = shift;
861 my $callbacks = shift; 1009 my $callbacks = shift;
862 1010
863 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
864 1012
865 local $override; 1013 local $override;
866 1014
867 for (@$callbacks) { 1015 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
… …
877 } 1025 }
878 1026
879 0 1027 0
880} 1028}
881 1029
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1031
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1033
886Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
887 1035
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1039
892=back 1040=back
893 1041
894=cut 1042=cut
895 1043
896############################################################################# 1044#############################################################################
897# 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}
898 1088
899sub reattach { 1089sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1091 my ($obj) = @_;
902 1092
1093 # no longer needed after getting rid of delete_package?
903 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
904 1095
905 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
906 1097
907 @$registry = (); 1098 @$registry = ();
908 1099
… …
923cf::attachable->attach ( 1114cf::attachable->attach (
924 prio => -1000000, 1115 prio => -1000000,
925 on_instantiate => sub { 1116 on_instantiate => sub {
926 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
927 1118
928 $data = from_json $data; 1119 $data = decode_json $data;
929 1120
930 for (@$data) { 1121 for (@$data) {
931 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
932 1123
933 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
… …
949sub object_freezer_save { 1140sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
951 1142
952 sync_job { 1143 sync_job {
953 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
956 1148
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1153 aio_close $fh;
962 1154
963 if (@$objs) { 1155 if (@$objs) {
964 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) {
965 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1161 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
971 } 1163 }
972 } else { 1164 } else {
973 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
974 } 1166 }
975 1167
976 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
977 } else { 1172 } else {
978 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
979 } 1174 }
980 } else { 1175 } else {
981 aio_unlink $filename; 1176 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
983 } 1178 }
984 } 1179 };
985} 1180}
986 1181
987sub object_freezer_as_string { 1182sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1183 my ($rdata, $objs) = @_;
989 1184
… …
1001 or return; 1196 or return;
1002 1197
1003 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1200 or return;
1201
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1007 } 1204 }
1008 1205
1206 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1209
1011 return ($data, $av); 1210 ($data, $av)
1012} 1211}
1013 1212
1014=head2 COMMAND CALLBACKS 1213=head2 COMMAND CALLBACKS
1015 1214
1016=over 4 1215=over 4
… …
1070 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1071 1270
1072 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1073} 1272}
1074 1273
1274use File::Glob ();
1275
1075cf::player->attach ( 1276cf::player->attach (
1076 on_command => sub { 1277 on_command => sub {
1077 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1078 1279
1079 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
… …
1089 my ($pl, $buf) = @_; 1290 my ($pl, $buf) = @_;
1090 1291
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1293
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1302 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1303 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1304 }
1305
1306 $pl->ext_reply ($reply, @reply)
1307 if $reply;
1308
1099 } else { 1309 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1311 }
1102 1312
1103 cf::override; 1313 cf::override;
1104 }, 1314 },
1105); 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}
1106 1329
1107sub load_extensions { 1330sub load_extensions {
1108 cf::sync_job { 1331 cf::sync_job {
1109 my %todo; 1332 my %todo;
1110 1333
… …
1130 1353
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133 1356
1134 $ext{source} = 1357 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1136 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1137 . $source 1360 . $source
1138 . "\n};\n1"; 1361 . "\n};\n1";
1139 1362
1140 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
… …
1156 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1158 1381
1159 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1383 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1385 }
1164 1386
1165 warn $msg; 1387 warn $msg;
1166 } 1388 }
1167 1389
… …
1181 1403
1182=back 1404=back
1183 1405
1184=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1185 1407
1186Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1187 1409
1188=cut 1410=cut
1189 1411
1190package cf::player; 1412package cf::player;
1191 1413
1192use Coro::AIO; 1414use Coro::AIO;
1193 1415
1194=head3 cf::player 1416=head3 cf::player
1195 1417
1196=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}
1197 1433
1198=item cf::player::find $login 1434=item cf::player::find $login
1199 1435
1200Returns the given player object, loading it if necessary (might block). 1436Returns the given player object, loading it if necessary (might block).
1201 1437
… …
1220 1456
1221sub exists($) { 1457sub exists($) {
1222 my ($login) = @_; 1458 my ($login) = @_;
1223 1459
1224 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1225 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1226} 1462}
1227 1463
1228sub find($) { 1464sub find($) {
1229 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1230 my $login = $_[0]; 1466 my $login = $_[0];
… …
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1473 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1474 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1475 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1476 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1477
1242 my $pl = load_pl path $login 1478 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1245 } 1487 }
1246 } 1488 }
1247} 1489}
1248 1490
… …
1257 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1258 1500
1259 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1261 1503
1504 cf::get_slot 0.01;
1505
1262 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1263 Coro::cede; 1507 cf::cede_to_tick;
1264} 1508}
1265 1509
1266sub new($) { 1510sub new($) {
1267 my ($login) = @_; 1511 my ($login) = @_;
1268 1512
… …
1274 $cf::PLAYER{$login} = $self; 1518 $cf::PLAYER{$login} = $self;
1275 1519
1276 $self 1520 $self
1277} 1521}
1278 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
1279=item $pl->quit_character 1533=item $pl->quit_character
1280 1534
1281Nukes the player without looking back. If logged in, the connection will 1535Nukes the player without looking back. If logged in, the connection will
1282be destroyed. May block for a long time. 1536be destroyed. May block for a long time.
1283 1537
… …
1287 my ($pl) = @_; 1541 my ($pl) = @_;
1288 1542
1289 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1290 1544
1291 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1292 $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
1293 1547
1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1295 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1296 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1297 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1298 1554
1299 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1300 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1336 or return []; 1592 or return [];
1337 1593
1338 my @logins; 1594 my @logins;
1339 1595
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1605 }
1344 1606
1345 utf8::decode $login; 1607 utf8::decode $login;
1346 push @logins, $login; 1608 push @logins, $login;
1347 } 1609 }
1348 1610
… …
1375 } 1637 }
1376 1638
1377 \@paths 1639 \@paths
1378} 1640}
1379 1641
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1381 1643
1382Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1383 1645
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406
1407 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g;
1409
1410 $_
1411}
1412
1413=item $player->ext_reply ($msgid, %msg) 1646=item $player->ext_reply ($msgid, @msg)
1414 1647
1415Sends an ext reply to the player. 1648Sends an ext reply to the player.
1416 1649
1417=cut 1650=cut
1418 1651
1419sub ext_reply($$%) { 1652sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1653 my ($self, $id, @msg) = @_;
1421 1654
1422 $msg{msgid} = $id; 1655 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1424} 1656}
1425 1657
1426=item $player->ext_event ($type, %msg) 1658=item $player->ext_msg ($type, @msg)
1427 1659
1428Sends an ext event to the client. 1660Sends an ext event to the client.
1429 1661
1430=cut 1662=cut
1431 1663
1432sub ext_event($$%) { 1664sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1665 my ($self, $type, @msg) = @_;
1434 1666
1435 $self->ns->ext_event ($type, %msg); 1667 $self->ns->ext_msg ($type, @msg);
1436} 1668}
1437 1669
1438=head3 cf::region 1670=head3 cf::region
1439 1671
1440=over 4 1672=over 4
… …
1453 my ($path) = @_; 1685 my ($path) = @_;
1454 1686
1455 my ($match, $specificity); 1687 my ($match, $specificity);
1456 1688
1457 for my $region (list) { 1689 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1690 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1691 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1692 if $region->specificity > $specificity;
1461 } 1693 }
1462 } 1694 }
1463 1695
… …
1484our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1485our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1486 1718
1487sub generate_random_map { 1719sub generate_random_map {
1488 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
1489 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1490 $self->_create_random_map ( 1725 $self->_create_random_map (
1491 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1492 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1493 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1583 $self->init; # pass $1 etc. 1818 $self->init; # pass $1 etc.
1584 return $self; 1819 return $self;
1585 } 1820 }
1586 } 1821 }
1587 1822
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1823 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1824 ()
1590} 1825}
1591 1826
1592sub init { 1827sub init {
1593 my ($self) = @_; 1828 my ($self) = @_;
… …
1615 1850
1616# the temporary/swap location 1851# the temporary/swap location
1617sub save_path { 1852sub save_path {
1618 my ($self) = @_; 1853 my ($self) = @_;
1619 1854
1620 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1621 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1622} 1857}
1623 1858
1624# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1625sub uniq_path { 1860sub uniq_path {
1626 my ($self) = @_; 1861 my ($self) = @_;
1627 1862
1628 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1629 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1630}
1631
1632# and all this just because we cannot iterate over
1633# all maps in C++...
1634sub change_all_map_light {
1635 my ($change) = @_;
1636
1637 $_->change_map_light ($change)
1638 for grep $_->outdoor, values %cf::MAP;
1639} 1865}
1640 1866
1641sub decay_objects { 1867sub decay_objects {
1642 my ($self) = @_; 1868 my ($self) = @_;
1643 1869
… …
1656 1882
1657sub load_header_from($) { 1883sub load_header_from($) {
1658 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1659 1885
1660 utf8::encode $path; 1886 utf8::encode $path;
1661 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1662 # or return;
1663
1664 $self->_load_header ($path)
1665 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;
1666 1895
1667 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1668 1897
1669 1 1898 1
1670} 1899}
… …
1724sub find { 1953sub find {
1725 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1726 1955
1727 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1728 1957
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1729 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1730 1960
1731 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1732 my $guard = cf::lock_acquire "map_find:$path";
1733 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1734 or return; 1963 or return;
1735 1964
1736 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1737 1966
… …
1739 or return; 1968 or return;
1740 1969
1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1742 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1743 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1974 undef $guard1;
1744 $map->reset; 1975 $map->reset;
1745 undef $guard;
1746 return find $path; 1976 return find $path;
1747 } 1977 }
1748 1978
1749 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1750 } 1980 }
… …
1759 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1760 1990
1761 my $path = $self->{path}; 1991 my $path = $self->{path};
1762 1992
1763 { 1993 {
1764 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1765 1995
1996 return unless $self->valid;
1766 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1767 1998
1768 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1769 2000
1770 $self->alloc; 2001 $self->alloc;
1771 2002
1772 $self->pre_load; 2003 $self->pre_load;
1773 Coro::cede; 2004 cf::cede_to_tick;
1774 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1775 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1776 or return; 2009 or return;
1777 2010
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1779 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1780 2013
1781 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq; 2015 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1784 $self->clear_unique_items; 2018 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1786 } 2022 }
1787 } 2023 }
1788 2024
1789 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1790 # now do the right thing for maps 2028 # now do the right thing for maps
1791 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1792 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1793 unless $self->difficulty; 2031 unless $self->difficulty;
1794 Coro::cede; 2032 cf::cede_to_tick;
1795 2033
1796 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1797 $self->decay_objects; 2035 $self->decay_objects;
1798 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1799 $self->update_buttons; 2037 $self->update_buttons;
1800 Coro::cede; 2038 cf::cede_to_tick;
1801 $self->set_darkness_map;
1802 Coro::cede;
1803 $self->activate; 2039 $self->activate;
1804 } 2040 }
1805 2041
2042 $self->{last_save} = $cf::RUNTIME;
2043 $self->last_access ($cf::RUNTIME);
2044
1806 $self->in_memory (cf::MAP_IN_MEMORY); 2045 $self->in_memory (cf::MAP_ACTIVE);
1807 } 2046 }
1808 2047
1809 $self->post_load; 2048 $self->post_load;
1810} 2049}
1811 2050
… …
1820 2059
1821 $self 2060 $self
1822} 2061}
1823 2062
1824# 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
1825sub load_diag { 2064sub load_neighbours {
1826 my ($map) = @_; 2065 my ($map) = @_;
1827 2066
1828 my @diag; # diagonal neighbours 2067 my @neigh; # diagonal neighbours
1829 2068
1830 for (0 .. 3) { 2069 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 2070 my $neigh = $map->tile_path ($_)
1832 or next; 2071 or next;
1833 $neigh = find $neigh, $map 2072 $neigh = find $neigh, $map
1834 or next; 2073 or next;
1835 $neigh->load; 2074 $neigh->load;
1836 2075
2076 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2077 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2078 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 2079 }
1840 2080
1841 for (@diag) { 2081 for (grep defined $_->[0], @neigh) {
2082 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 2083 my $neigh = find $path, $origin
1843 or next; 2084 or next;
1844 $neigh->load; 2085 $neigh->load;
1845 } 2086 }
1846} 2087}
1847 2088
… …
1852} 2093}
1853 2094
1854sub do_load_sync { 2095sub do_load_sync {
1855 my ($map) = @_; 2096 my ($map) = @_;
1856 2097
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main;
2100
1857 cf::sync_job { $map->load }; 2101 cf::sync_job { $map->load };
1858} 2102}
1859 2103
1860our %MAP_PREFETCH; 2104our %MAP_PREFETCH;
1861our $MAP_PREFETCHER = undef; 2105our $MAP_PREFETCHER = undef;
1862 2106
1863sub find_async { 2107sub find_async {
1864 my ($path, $origin) = @_; 2108 my ($path, $origin, $load) = @_;
1865 2109
1866 $path = normalise $path, $origin && $origin->{path}; 2110 $path = normalise $path, $origin && $origin->{path};
1867 2111
1868 if (my $map = $cf::MAP{$path}) { 2112 if (my $map = $cf::MAP{$path}) {
1869 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1870 } 2114 }
1871 2115
1872 undef $MAP_PREFETCH{$path}; 2116 $MAP_PREFETCH{$path} |= $load;
2117
1873 $MAP_PREFETCHER ||= cf::async { 2118 $MAP_PREFETCHER ||= cf::async {
2119 $Coro::current->{desc} = "map prefetcher";
2120
1874 while (%MAP_PREFETCH) { 2121 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 2122 while (my ($k, $v) = each %MAP_PREFETCH) {
1876 my $map = find $path 2123 if (my $map = find $k) {
1877 or next;
1878 $map->load; 2124 $map->load if $v;
2125 }
1879 2126
1880 delete $MAP_PREFETCH{$path}; 2127 delete $MAP_PREFETCH{$k};
1881 } 2128 }
1882 } 2129 }
1883 undef $MAP_PREFETCHER; 2130 undef $MAP_PREFETCHER;
1884 }; 2131 };
1885 $MAP_PREFETCHER->prio (6); 2132 $MAP_PREFETCHER->prio (6);
… …
1888} 2135}
1889 2136
1890sub save { 2137sub save {
1891 my ($self) = @_; 2138 my ($self) = @_;
1892 2139
1893 my $lock = cf::lock_acquire "map_data:" . $self->path; 2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
1894 2141
1895 $self->{last_save} = $cf::RUNTIME; 2142 $self->{last_save} = $cf::RUNTIME;
1896 2143
1897 return unless $self->dirty; 2144 return unless $self->dirty;
1898 2145
… …
1904 return if $self->{deny_save}; 2151 return if $self->{deny_save};
1905 2152
1906 local $self->{last_access} = $self->last_access;#d# 2153 local $self->{last_access} = $self->last_access;#d#
1907 2154
1908 cf::async { 2155 cf::async {
2156 $Coro::current->{desc} = "map player save";
1909 $_->contr->save for $self->players; 2157 $_->contr->save for $self->players;
1910 }; 2158 };
2159
2160 cf::get_slot 0.02;
1911 2161
1912 if ($uniq) { 2162 if ($uniq) {
1913 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1914 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2164 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1915 } else { 2165 } else {
… …
1921 my ($self) = @_; 2171 my ($self) = @_;
1922 2172
1923 # save first because save cedes 2173 # save first because save cedes
1924 $self->save; 2174 $self->save;
1925 2175
1926 my $lock = cf::lock_acquire "map_data:" . $self->path; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
1927 2177
1928 return if $self->players; 2178 return if $self->players;
1929 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_ACTIVE;
1930 return if $self->{deny_save}; 2180 return if $self->{deny_save};
1931 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
1932 $self->clear; 2186 $self->clear;
1933 $self->in_memory (cf::MAP_SWAPPED);
1934} 2187}
1935 2188
1936sub reset_at { 2189sub reset_at {
1937 my ($self) = @_; 2190 my ($self) = @_;
1938 2191
… …
1970 if $uniq; 2223 if $uniq;
1971 } 2224 }
1972 2225
1973 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
1974 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
1975 $self->clear; 2230 $self->clear;
1976
1977 $_->clear_links_to ($self) for values %cf::MAP;
1978 2231
1979 $self->unlink_save; 2232 $self->unlink_save;
1980 $self->destroy; 2233 $self->destroy;
1981} 2234}
1982 2235
1983my $nuke_counter = "aaaa"; 2236my $nuke_counter = "aaaa";
1984 2237
1985sub nuke { 2238sub nuke {
1986 my ($self) = @_; 2239 my ($self) = @_;
1987 2240
2241 {
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
1988 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
1989 2245
1990 $self->unlink_save; 2246 $self->unlink_save;
1991 2247
1992 bless $self, "cf::map"; 2248 bless $self, "cf::map";
1993 delete $self->{deny_reset}; 2249 delete $self->{deny_reset};
1994 $self->{deny_save} = 1; 2250 $self->{deny_save} = 1;
1995 $self->reset_timeout (1); 2251 $self->reset_timeout (1);
1996 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997 2253
1998 $cf::MAP{$self->path} = $self; 2254 $cf::MAP{$self->path} = $self;
2255 }
1999 2256
2000 $self->reset; # polite request, might not happen 2257 $self->reset; # polite request, might not happen
2001} 2258}
2002 2259
2003=item $maps = cf::map::tmp_maps 2260=item $maps = cf::map::tmp_maps
… …
2045 2302
2046sub unique_maps() { 2303sub unique_maps() {
2047 [ 2304 [
2048 map { 2305 map {
2049 utf8::decode $_; 2306 utf8::decode $_;
2050 /\.map$/ 2307 s/\.map$//; # TODO future compatibility hack
2308 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2309 ? ()
2051 ? normalise $_ 2310 : normalise $_
2052 : ()
2053 } @{ aio_readdir $UNIQUEDIR or [] } 2311 } @{ aio_readdir $UNIQUEDIR or [] }
2054 ] 2312 ]
2055} 2313}
2056 2314
2057package cf;
2058
2059=back 2315=back
2060 2316
2061=head3 cf::object 2317=head3 cf::object
2062 2318
2063=cut 2319=cut
… …
2066 2322
2067=over 4 2323=over 4
2068 2324
2069=item $ob->inv_recursive 2325=item $ob->inv_recursive
2070 2326
2071Returns 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.
2072 2329
2073=cut 2330=cut
2074 2331
2075sub inv_recursive_; 2332sub inv_recursive_;
2076sub inv_recursive_ { 2333sub inv_recursive_ {
… …
2079 2336
2080sub inv_recursive { 2337sub inv_recursive {
2081 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2082} 2339}
2083 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
2084package cf; 2369package cf;
2085 2370
2086=back 2371=back
2087 2372
2088=head3 cf::object::player 2373=head3 cf::object::player
… …
2094Sends 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>
2095can 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
2096dialogue with the given NPC character. 2381dialogue with the given NPC character.
2097 2382
2098=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};
2099 2398
2100# rough implementation of a future "reply" method that works 2399# rough implementation of a future "reply" method that works
2101# with dialog boxes. 2400# with dialog boxes.
2102#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
2103sub cf::object::player::reply($$$;$) { 2402sub cf::object::player::reply($$$;$) {
… …
2110 2409
2111 } else { 2410 } else {
2112 my $pl = $self->contr; 2411 my $pl = $self->contr;
2113 2412
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2413 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2414 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2415 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2416
2123 } else { 2417 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2418 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2419 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2126 } 2420 }
2127 } 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 (@_);
2128} 2432}
2129 2433
2130=item $player_object->may ("access") 2434=item $player_object->may ("access")
2131 2435
2132Returns wether the given player is authorized to access resource "access" 2436Returns wether the given player is authorized to access resource "access"
… …
2145 2449
2146=item $player_object->enter_link 2450=item $player_object->enter_link
2147 2451
2148Freezes 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}>).
2149 2453
2150The 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.
2151I<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.
2152 2458
2153Will never block. 2459Will never block.
2154 2460
2155=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2156 2462
… …
2211 # use -1 or undef as default coordinates, not 0, 0 2517 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2518 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2519 if $x <=0 && $y <= 0;
2214 2520
2215 $map->load; 2521 $map->load;
2216 $map->load_diag; 2522 $map->load_neighbours;
2217 2523
2218 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2219 $self->activate_recursive; 2526 $self->activate_recursive;
2220 2527
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2223} 2530}
2224 2531
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2533
2227Moves 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
2228her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2229that 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
2230the 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 >>.
2231 2542
2232=cut 2543=cut
2233 2544
2234our $GOTOGEN; 2545our $GOTOGEN;
2235 2546
2236sub cf::object::player::goto { 2547sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2548 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2549
2239 # 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
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2552
2242 $self->enter_link; 2553 $self->enter_link;
2243 2554
2244 (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
2245 my $map = eval { 2577 my $map = eval {
2246 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2247 2579
2248 if ($map) { 2580 if ($map) {
2249 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2250 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2251 } else { 2583 } else {
2252 $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);
2253 } 2585 }
2254 2586
2255 $map 2587 $map
2256 }; 2588 };
2257 2589
… …
2262 2594
2263 if ($gen == $self->{_goto_generation}) { 2595 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2596 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2597 $self->leave_link ($map, $x, $y);
2266 } 2598 }
2599
2600 $done->() if $done;
2267 })->prio (1); 2601 })->prio (1);
2268} 2602}
2269 2603
2270=item $player_object->enter_exit ($exit_object) 2604=item $player_object->enter_exit ($exit_object)
2271 2605
… …
2291} 2625}
2292 2626
2293sub prepare_random_map { 2627sub prepare_random_map {
2294 my ($exit) = @_; 2628 my ($exit) = @_;
2295 2629
2296 my $guard = cf::lock_acquire "exit_prepare:$exit";
2297
2298 # all this does is basically replace the /! path by 2630 # all this does is basically replace the /! path by
2299 # a new random map path (?random/...) with a seed 2631 # a new random map path (?random/...) with a seed
2300 # that depends on the exit object 2632 # that depends on the exit object
2301 2633
2302 my $rmp = parse_random_map_params $exit->msg; 2634 my $rmp = parse_random_map_params $exit->msg;
… …
2304 if ($exit->map) { 2636 if ($exit->map) {
2305 $rmp->{region} = $exit->region->name; 2637 $rmp->{region} = $exit->region->name;
2306 $rmp->{origin_map} = $exit->map->path; 2638 $rmp->{origin_map} = $exit->map->path;
2307 $rmp->{origin_x} = $exit->x; 2639 $rmp->{origin_x} = $exit->x;
2308 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2641
2642 $exit->map->touch;
2309 } 2643 }
2310 2644
2311 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2312 2646
2313 my $data = cf::to_json $rmp; 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2314 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2315 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2316 2650
2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2318 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2319 undef $fh; 2653 undef $fh;
2320 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
2321 2655
2656 my $slaying = "?random/$md5";
2657
2658 if ($exit->valid) {
2322 $exit->slaying ("?random/$md5"); 2659 $exit->slaying ("?random/$md5");
2323 $exit->msg (undef); 2660 $exit->msg (undef);
2661 }
2324 } 2662 }
2325} 2663}
2326 2664
2327sub cf::object::player::enter_exit { 2665sub cf::object::player::enter_exit {
2328 my ($self, $exit) = @_; 2666 my ($self, $exit) = @_;
2329 2667
2330 return unless $self->type == cf::PLAYER; 2668 return unless $self->type == cf::PLAYER;
2331 2669
2332 if ($exit->slaying eq "/!") {
2333 #TODO: this should de-fi-ni-te-ly not be a sync-job
2334 # the problem is that $exit might not survive long enough
2335 # so it needs to be done right now, right here
2336 cf::sync_job { prepare_random_map $exit };
2337 }
2338
2339 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2340 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp;
2342
2343 $self->enter_link; 2670 $self->enter_link;
2344 2671
2345 (async { 2672 (async {
2346 $self->deactivate_recursive; # just to be sure 2673 $Coro::current->{desc} = "enter_exit";
2674
2347 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
2348 $self->goto ($slaying, $hp, $sp); 2690 $self->goto ($map, $x, $y);
2349 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
2350 1; 2696 1
2351 }) { 2697 }) {
2352 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2353 . "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. "
2354 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2355 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2356 2702
2357 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
… …
2376 2722
2377 utf8::encode $text; 2723 utf8::encode $text;
2378 $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);
2379} 2725}
2380 2726
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2727=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2728
2383Send a drawinfo or msg packet to the client, formatting the msg for the 2729Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of 2730client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress 2731the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet. 2732the message unless the client supports the msg packet.
2387 2733
2388=cut 2734=cut
2389 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/statistics" => {
2775 id => "infobox",
2776 title => "Statistics",
2777 reply => undef,
2778 tooltip => "Shows your primary statistics",
2779 },
2780 "c/skills" => {
2781 id => "infobox",
2782 title => "Skills",
2783 reply => undef,
2784 tooltip => "Shows your experience per skill and item power",
2785 },
2786 "c/resistances" => {
2787 id => "infobox",
2788 title => "Resistances",
2789 reply => undef,
2790 tooltip => "Shows your resistances",
2791 },
2792 "c/pets" => {
2793 id => "infobox",
2794 title => "Pets",
2795 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet",
2797 },
2798 "c/uptime" => {
2799 id => "infobox",
2800 title => "Uptime",
2801 reply => undef,
2802 tooltip => "How long the server has been running since last restart",
2803 },
2804 "c/mapinfo" => {
2805 id => "infobox",
2806 title => "Map Info",
2807 reply => undef,
2808 tooltip => "Information related to the maps",
2809 },
2810 "c/party" => {
2811 id => "party",
2812 title => "Party",
2813 reply => "gsay ",
2814 tooltip => "Messages and chat related to your party",
2815 },
2816 "c/death" => {
2817 id => "death",
2818 title => "Death",
2819 reply => undef,
2820 tooltip => "Reason for and more info about your most recent death",
2821 },
2822 "c/say" => $SAY_CHANNEL,
2823 "c/chat" => $CHAT_CHANNEL,
2824);
2825
2390sub cf::client::send_msg { 2826sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2827 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2828
2393 $msg = $self->pl->expand_cfpod ($msg); 2829 $msg = $self->pl->expand_cfpod ($msg)
2830 unless $color & cf::NDI_VERBATIM;
2394 2831
2395 if ($self->can_msg) { 2832 $color &= cf::NDI_CLIENT_MASK; # just in case...
2396 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2397 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407 2833
2408 if ($color >= 0) { 2834 # check predefined channels, for the benefit of C
2409 if (0 && $msg =~ /\[/) { 2835 if ($CHANNEL{$channel}) {
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 2836 $channel = $CHANNEL{$channel};
2411 } else { 2837
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2838 $self->ext_msg (channel_info => $channel);
2413 $self->send_packet ("drawinfo $color $msg") 2839 $channel = $channel->{id};
2840
2841 } elsif (ref $channel) {
2842 # send meta info to client, if not yet sent
2843 unless (exists $self->{channel}{$channel->{id}}) {
2844 $self->{channel}{$channel->{id}} = $channel;
2845 $self->ext_msg (channel_info => $channel);
2414 } 2846 }
2415 }
2416 }
2417}
2418 2847
2848 $channel = $channel->{id};
2849 }
2850
2851 return unless @extra || length $msg;
2852
2853 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF;
2856
2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 );
2861
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt);
2873}
2874
2419=item $client->ext_event ($type, %msg) 2875=item $client->ext_msg ($type, @msg)
2420 2876
2421Sends an ext event to the client. 2877Sends an ext event to the client.
2422 2878
2423=cut 2879=cut
2424 2880
2425sub cf::client::ext_event($$%) { 2881sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 2882 my ($self, $type, @msg) = @_;
2427 2883
2884 if ($self->extcmd == 2) {
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2886 } elsif ($self->extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 2887 push @msg, msgtype => "event_$type";
2429 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 }
2890}
2891
2892=item $client->ext_reply ($msgid, @msg)
2893
2894Sends an ext reply to the client.
2895
2896=cut
2897
2898sub cf::client::ext_reply($$@) {
2899 my ($self, $id, @msg) = @_;
2900
2901 if ($self->extcmd == 2) {
2902 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2903 } elsif ($self->extcmd == 1) {
2904 #TODO: version 1, remove
2905 unshift @msg, msgtype => "reply", msgid => $id;
2906 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2907 }
2430} 2908}
2431 2909
2432=item $success = $client->query ($flags, "text", \&cb) 2910=item $success = $client->query ($flags, "text", \&cb)
2433 2911
2434Queues a query to the client, calling the given callback with 2912Queues a query to the client, calling the given callback with
… …
2489 my ($ns, $buf) = @_; 2967 my ($ns, $buf) = @_;
2490 2968
2491 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2969 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2492 2970
2493 if (ref $msg) { 2971 if (ref $msg) {
2972 my ($type, $reply, @payload) =
2973 "ARRAY" eq ref $msg
2974 ? @$msg
2975 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2976
2977 my @reply;
2978
2494 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2979 if (my $cb = $EXTICMD{$type}) {
2495 if (my %reply = $cb->($ns, $msg)) { 2980 @reply = $cb->($ns, @payload);
2496 $reply{msgid} = $msg->{msgid};
2497 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2498 }
2499 } 2981 }
2982
2983 $ns->ext_reply ($reply, @reply)
2984 if $reply;
2985
2500 } else { 2986 } else {
2501 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2987 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2502 } 2988 }
2503 2989
2504 cf::override; 2990 cf::override;
… …
2551our $safe = new Safe "safe"; 3037our $safe = new Safe "safe";
2552our $safe_hole = new Safe::Hole; 3038our $safe_hole = new Safe::Hole;
2553 3039
2554$SIG{FPE} = 'IGNORE'; 3040$SIG{FPE} = 'IGNORE';
2555 3041
2556$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3042$safe->permit_only (Opcode::opset qw(
3043 :base_core :base_mem :base_orig :base_math
3044 grepstart grepwhile mapstart mapwhile
3045 sort time
3046));
2557 3047
2558# here we export the classes and methods available to script code 3048# here we export the classes and methods available to script code
2559 3049
2560=pod 3050=pod
2561 3051
2562The following functions and methods are available within a safe environment: 3052The following functions and methods are available within a safe environment:
2563 3053
2564 cf::object contr pay_amount pay_player map 3054 cf::object
3055 contr pay_amount pay_player map x y force_find force_add destroy
3056 insert remove name archname title slaying race decrease split
3057
2565 cf::object::player player 3058 cf::object::player
2566 cf::player peaceful 3059 player
2567 cf::map trigger 3060
3061 cf::player
3062 peaceful
3063
3064 cf::map
3065 trigger
2568 3066
2569=cut 3067=cut
2570 3068
2571for ( 3069for (
2572 ["cf::object" => qw(contr pay_amount pay_player map)], 3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3071 insert remove inv nrof name archname title slaying race
3072 decrease split destroy change_exp)],
2573 ["cf::object::player" => qw(player)], 3073 ["cf::object::player" => qw(player)],
2574 ["cf::player" => qw(peaceful)], 3074 ["cf::player" => qw(peaceful)],
2575 ["cf::map" => qw(trigger)], 3075 ["cf::map" => qw(trigger)],
2576) { 3076) {
2577 no strict 'refs'; 3077 no strict 'refs';
… …
2653# the server's init and main functions 3153# the server's init and main functions
2654 3154
2655sub load_facedata($) { 3155sub load_facedata($) {
2656 my ($path) = @_; 3156 my ($path) = @_;
2657 3157
3158 # HACK to clear player env face cache, we need some signal framework
3159 # for this (global event?)
3160 %ext::player_env::MUSIC_FACE_CACHE = ();
3161
3162 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3163
2658 warn "loading facedata from $path\n"; 3164 warn "loading facedata from $path\n";
2659 3165
2660 my $facedata; 3166 my $facedata;
2661 0 < aio_load $path, $facedata 3167 0 < aio_load $path, $facedata
2662 or die "$path: $!"; 3168 or die "$path: $!";
… …
2664 $facedata = Coro::Storable::thaw $facedata; 3170 $facedata = Coro::Storable::thaw $facedata;
2665 3171
2666 $facedata->{version} == 2 3172 $facedata->{version} == 2
2667 or cf::cleanup "$path: version mismatch, cannot proceed."; 3173 or cf::cleanup "$path: version mismatch, cannot proceed.";
2668 3174
3175 # patch in the exptable
3176 $facedata->{resource}{"res/exp_table"} = {
3177 type => FT_RSRC,
3178 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3179 };
3180 cf::cede_to_tick;
3181
2669 { 3182 {
2670 my $faces = $facedata->{faceinfo}; 3183 my $faces = $facedata->{faceinfo};
2671 3184
2672 while (my ($face, $info) = each %$faces) { 3185 while (my ($face, $info) = each %$faces) {
2673 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3186 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3187
2674 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3188 cf::face::set_visibility $idx, $info->{visibility};
3189 cf::face::set_magicmap $idx, $info->{magicmap};
2675 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3190 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2676 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3191 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2677 Coro::cede; 3192
3193 cf::cede_to_tick;
2678 } 3194 }
2679 3195
2680 while (my ($face, $info) = each %$faces) { 3196 while (my ($face, $info) = each %$faces) {
2681 next unless $info->{smooth}; 3197 next unless $info->{smooth};
3198
2682 my $idx = cf::face::find $face 3199 my $idx = cf::face::find $face
2683 or next; 3200 or next;
3201
2684 if (my $smooth = cf::face::find $info->{smooth}) { 3202 if (my $smooth = cf::face::find $info->{smooth}) {
3203 cf::face::set_smooth $idx, $smooth;
2685 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3204 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2686 } else { 3205 } else {
2687 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3206 warn "smooth face '$info->{smooth}' not found for face '$face'";
2688 } 3207 }
2689 Coro::cede; 3208
3209 cf::cede_to_tick;
2690 } 3210 }
2691 } 3211 }
2692 3212
2693 { 3213 {
2694 my $anims = $facedata->{animinfo}; 3214 my $anims = $facedata->{animinfo};
2695 3215
2696 while (my ($anim, $info) = each %$anims) { 3216 while (my ($anim, $info) = each %$anims) {
2697 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3217 cf::anim::set $anim, $info->{frames}, $info->{facings};
2698 Coro::cede; 3218 cf::cede_to_tick;
2699 } 3219 }
2700 3220
2701 cf::anim::invalidate_all; # d'oh 3221 cf::anim::invalidate_all; # d'oh
2702 } 3222 }
2703 3223
3224 {
3225 # TODO: for gcfclient pleasure, we should give resources
3226 # that gcfclient doesn't grok a >10000 face index.
3227 my $res = $facedata->{resource};
3228
3229 while (my ($name, $info) = each %$res) {
3230 if (defined $info->{type}) {
3231 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3232 my $data;
3233
3234 if ($info->{type} & 1) {
3235 # prepend meta info
3236
3237 my $meta = $enc->encode ({
3238 name => $name,
3239 %{ $info->{meta} || {} },
3240 });
3241
3242 $data = pack "(w/a*)*", $meta, $info->{data};
3243 } else {
3244 $data = $info->{data};
3245 }
3246
3247 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3248 cf::face::set_type $idx, $info->{type};
3249 } else {
3250 $RESOURCE{$name} = $info;
3251 }
3252
3253 cf::cede_to_tick;
3254 }
3255 }
3256
3257 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3258
2704 1 3259 1
2705} 3260}
2706 3261
3262cf::global->attach (on_resource_update => sub {
3263 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3264 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3265
3266 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3267 my $sound = $soundconf->{compat}[$_]
3268 or next;
3269
3270 my $face = cf::face::find "sound/$sound->[1]";
3271 cf::sound::set $sound->[0] => $face;
3272 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3273 }
3274
3275 while (my ($k, $v) = each %{$soundconf->{event}}) {
3276 my $face = cf::face::find "sound/$v";
3277 cf::sound::set $k => $face;
3278 }
3279 }
3280});
3281
3282register_exticmd fx_want => sub {
3283 my ($ns, $want) = @_;
3284
3285 while (my ($k, $v) = each %$want) {
3286 $ns->fx_want ($k, $v);
3287 }
3288};
3289
3290sub load_resource_file($) {
3291 my $guard = lock_acquire "load_resource_file";
3292
3293 my $status = load_resource_file_ $_[0];
3294 get_slot 0.1, 100;
3295 cf::arch::commit_load;
3296
3297 $status
3298}
3299
2707sub reload_regions { 3300sub reload_regions {
3301 # HACK to clear player env face cache, we need some signal framework
3302 # for this (global event?)
3303 %ext::player_env::MUSIC_FACE_CACHE = ();
3304
2708 load_resource_file "$MAPDIR/regions" 3305 load_resource_file "$MAPDIR/regions"
2709 or die "unable to load regions file\n"; 3306 or die "unable to load regions file\n";
3307
3308 for (cf::region::list) {
3309 $_->{match} = qr/$_->{match}/
3310 if exists $_->{match};
3311 }
2710} 3312}
2711 3313
2712sub reload_facedata { 3314sub reload_facedata {
2713 load_facedata "$DATADIR/facedata" 3315 load_facedata "$DATADIR/facedata"
2714 or die "unable to load facedata\n"; 3316 or die "unable to load facedata\n";
2715} 3317}
2716 3318
2717sub reload_archetypes { 3319sub reload_archetypes {
2718 load_resource_file "$DATADIR/archetypes" 3320 load_resource_file "$DATADIR/archetypes"
2719 or die "unable to load archetypes\n"; 3321 or die "unable to load archetypes\n";
2720 #d# NEED to laod twice to resolve forward references
2721 # this really needs to be done in an extra post-pass
2722 # (which needs to be synchronous, so solve it differently)
2723 load_resource_file "$DATADIR/archetypes"
2724 or die "unable to load archetypes\n";
2725} 3322}
2726 3323
2727sub reload_treasures { 3324sub reload_treasures {
2728 load_resource_file "$DATADIR/treasures" 3325 load_resource_file "$DATADIR/treasures"
2729 or die "unable to load treasurelists\n"; 3326 or die "unable to load treasurelists\n";
2730} 3327}
2731 3328
2732sub reload_resources { 3329sub reload_resources {
2733 warn "reloading resource files...\n"; 3330 warn "reloading resource files...\n";
2734 3331
3332 reload_facedata;
3333 reload_archetypes;
2735 reload_regions; 3334 reload_regions;
2736 reload_facedata;
2737 #reload_archetypes;#d#
2738 reload_archetypes;
2739 reload_treasures; 3335 reload_treasures;
2740 3336
2741 warn "finished reloading resource files\n"; 3337 warn "finished reloading resource files\n";
2742} 3338}
2743 3339
2744sub init { 3340sub reload_config {
2745 reload_resources;
2746}
2747
2748sub cfg_load {
2749 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
2750 or return; 3342 or return;
2751 3343
2752 local $/; 3344 local $/;
2753 *CFG = YAML::Syck::Load <$fh>; 3345 *CFG = YAML::Load <$fh>;
2754 3346
2755 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2756 3348
2757 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2758 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2764 }; 3356 };
2765 warn $@ if $@; 3357 warn $@ if $@;
2766 } 3358 }
2767} 3359}
2768 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
2769sub main { 3380sub main {
3381 cf::init_globals; # initialise logging
3382
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3394
2770 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
2771 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
2772 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2773 (async { 3398 (async {
2774 Event::one_event; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3400 EV::loop EV::LOOP_ONESHOT;
2775 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
2776 }; 3402 };
2777 3403
2778 cfg_load; 3404 evthread_start IO::AIO::poll_fileno;
3405
3406 cf::sync_job {
3407 reload_resources;
3408 reload_config;
2779 db_init; 3409 db_init;
3410
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid;
3414 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills;
3417
3418 cf::init_beforeplay;
3419
3420 atomic;
3421
2780 load_extensions; 3422 load_extensions;
2781 3423
2782 $TICK_WATCHER->start; 3424 utime time, time, $RUNTIMEFILE;
3425
3426 # no (long-running) fork's whatsoever before this point(!)
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428
3429 (pop @POST_INIT)->(0) while @POST_INIT;
3430 };
3431
2783 Event::loop; 3432 EV::loop;
2784} 3433}
2785 3434
2786############################################################################# 3435#############################################################################
2787# initialisation and cleanup 3436# initialisation and cleanup
2788 3437
2789# install some emergency cleanup handlers 3438# install some emergency cleanup handlers
2790BEGIN { 3439BEGIN {
3440 our %SIGWATCHER = ();
2791 for my $signal (qw(INT HUP TERM)) { 3441 for my $signal (qw(INT HUP TERM)) {
2792 Event->signal ( 3442 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2793 reentrant => 0,
2794 data => WF_AUTOCANCEL,
2795 signal => $signal,
2796 prio => 0,
2797 cb => sub {
2798 cf::cleanup "SIG$signal"; 3443 cf::cleanup "SIG$signal";
2799 },
2800 ); 3444 };
2801 } 3445 }
2802} 3446}
2803 3447
2804sub write_runtime { 3448sub write_runtime_sync {
2805 my $runtime = "$LOCALDIR/runtime";
2806
2807 # first touch the runtime file to show we are still running: 3449 # first touch the runtime file to show we are still running:
2808 # the fsync below can take a very very long time. 3450 # the fsync below can take a very very long time.
2809 3451
2810 IO::AIO::aio_utime $runtime, undef, undef; 3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2811 3453
2812 my $guard = cf::lock_acquire "write_runtime"; 3454 my $guard = cf::lock_acquire "write_runtime";
2813 3455
2814 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2815 or return; 3457 or return;
2816 3458
2817 my $value = $cf::RUNTIME + 90 + 10; 3459 my $value = $cf::RUNTIME + 90 + 10;
2818 # 10 is the runtime save interval, for a monotonic clock 3460 # 10 is the runtime save interval, for a monotonic clock
2819 # 60 allows for the watchdog to kill the server. 3461 # 60 allows for the watchdog to kill the server.
… …
2829 aio_utime $fh, undef, undef; 3471 aio_utime $fh, undef, undef;
2830 3472
2831 close $fh 3473 close $fh
2832 or return; 3474 or return;
2833 3475
2834 aio_rename "$runtime~", $runtime 3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2835 and return; 3477 and return;
2836 3478
2837 warn "runtime file written.\n"; 3479 warn "runtime file written.\n";
2838 3480
2839 1 3481 1
3482}
3483
3484our $uuid_lock;
3485our $uuid_skip;
3486
3487sub write_uuid_sync($) {
3488 $uuid_skip ||= $_[0];
3489
3490 return if $uuid_lock;
3491 local $uuid_lock = 1;
3492
3493 my $uuid = "$LOCALDIR/uuid";
3494
3495 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3496 or return;
3497
3498 my $value = uuid_seq uuid_cur;
3499
3500 unless ($value) {
3501 warn "cowardly refusing to write zero uuid value!\n";
3502 return;
3503 }
3504
3505 my $value = uuid_str $value + $uuid_skip;
3506 $uuid_skip = 0;
3507
3508 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3509 and return;
3510
3511 # always fsync - this file is important
3512 aio_fsync $fh
3513 and return;
3514
3515 close $fh
3516 or return;
3517
3518 aio_rename "$uuid~", $uuid
3519 and return;
3520
3521 warn "uuid file written ($value).\n";
3522
3523 1
3524
3525}
3526
3527sub write_uuid($$) {
3528 my ($skip, $sync) = @_;
3529
3530 $sync ? write_uuid_sync $skip
3531 : async { write_uuid_sync $skip };
2840} 3532}
2841 3533
2842sub emergency_save() { 3534sub emergency_save() {
2843 my $freeze_guard = cf::freeze_mainloop; 3535 my $freeze_guard = cf::freeze_mainloop;
2844 3536
2845 warn "enter emergency perl save\n"; 3537 warn "emergency_perl_save: enter\n";
2846 3538
2847 cf::sync_job { 3539 cf::sync_job {
3540 # this is a trade-off: we want to be very quick here, so
3541 # save all maps without fsync, and later call a global sync
3542 # (which in turn might be very very slow)
3543 local $USE_FSYNC = 0;
3544
2848 # use a peculiar iteration method to avoid tripping on perl 3545 # use a peculiar iteration method to avoid tripping on perl
2849 # refcount bugs in for. also avoids problems with players 3546 # refcount bugs in for. also avoids problems with players
2850 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
2851 warn "begin emergency player save\n"; 3548 warn "emergency_perl_save: begin player save\n";
2852 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
2853 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
2854 $pl->valid or next; 3551 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2855 $pl->save; 3553 $pl->save;
2856 } 3554 }
2857 warn "end emergency player save\n"; 3555 warn "emergency_perl_save: end player save\n";
2858 3556
2859 warn "begin emergency map save\n"; 3557 warn "emergency_perl_save: begin map save\n";
2860 for my $path (keys %cf::MAP) { 3558 for my $path (keys %cf::MAP) {
2861 my $map = $cf::MAP{$path} or next; 3559 my $map = $cf::MAP{$path} or next;
2862 $map->valid or next; 3560 $map->valid or next;
2863 $map->save; 3561 $map->save;
2864 } 3562 }
2865 warn "end emergency map save\n"; 3563 warn "emergency_perl_save: end map save\n";
2866 3564
2867 warn "begin emergency database checkpoint\n"; 3565 warn "emergency_perl_save: begin database checkpoint\n";
2868 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
2869 warn "end emergency database checkpoint\n"; 3567 warn "emergency_perl_save: end database checkpoint\n";
3568
3569 warn "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1;
3571 warn "emergency_perl_save: end write uuid\n";
2870 }; 3572 };
2871 3573
3574 warn "emergency_perl_save: starting sync()\n";
3575 IO::AIO::aio_sync sub {
3576 warn "emergency_perl_save: finished sync()\n";
3577 };
3578
2872 warn "leave emergency perl save\n"; 3579 warn "emergency_perl_save: leave\n";
2873} 3580}
2874 3581
2875sub post_cleanup { 3582sub post_cleanup {
2876 my ($make_core) = @_; 3583 my ($make_core) = @_;
2877 3584
2878 warn Carp::longmess "post_cleanup backtrace" 3585 warn Carp::longmess "post_cleanup backtrace"
2879 if $make_core; 3586 if $make_core;
3587
3588 my $fh = pidfile;
3589 unlink $PIDFILE if <$fh> == $$;
3590}
3591
3592# a safer delete_package, copied from Symbol
3593sub clear_package($) {
3594 my $pkg = shift;
3595
3596 # expand to full symbol table name if needed
3597 unless ($pkg =~ /^main::.*::$/) {
3598 $pkg = "main$pkg" if $pkg =~ /^::/;
3599 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3600 $pkg .= '::' unless $pkg =~ /::$/;
3601 }
3602
3603 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3604 my $stem_symtab = *{$stem}{HASH};
3605
3606 defined $stem_symtab and exists $stem_symtab->{$leaf}
3607 or return;
3608
3609 # clear all symbols
3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3611 for my $name (keys %$leaf_symtab) {
3612 _gv_clear *{"$pkg$name"};
3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3614 }
3615 warn "cleared package $pkg\n";#d#
2880} 3616}
2881 3617
2882sub do_reload_perl() { 3618sub do_reload_perl() {
2883 # can/must only be called in main 3619 # can/must only be called in main
2884 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
2885 warn "can only reload from main coroutine"; 3621 warn "can only reload from main coroutine";
2886 return; 3622 return;
2887 } 3623 }
2888 3624
3625 return if $RELOAD++;
3626
3627 my $t1 = EV::time;
3628
3629 while ($RELOAD) {
2889 warn "reloading..."; 3630 warn "reloading...";
2890 3631
2891 warn "entering sync_job"; 3632 warn "entering sync_job";
2892 3633
2893 cf::sync_job { 3634 cf::sync_job {
2894 cf::write_runtime; # external watchdog should not bark 3635 cf::write_runtime_sync; # external watchdog should not bark
2895 cf::emergency_save; 3636 cf::emergency_save;
2896 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
2897 3638
2898 warn "syncing database to disk"; 3639 warn "syncing database to disk";
2899 BDB::db_env_txn_checkpoint $DB_ENV; 3640 BDB::db_env_txn_checkpoint $DB_ENV;
2900 3641
2901 # if anything goes wrong in here, we should simply crash as we already saved 3642 # if anything goes wrong in here, we should simply crash as we already saved
2902 3643
2903 warn "cancelling all WF_AUTOCANCEL watchers";
2904 for (Event::all_watchers) {
2905 $_->cancel if $_->data & WF_AUTOCANCEL;
2906 }
2907
2908 warn "flushing outstanding aio requests"; 3644 warn "flushing outstanding aio requests";
2909 for (;;) {
2910 BDB::flush;
2911 IO::AIO::flush;
2912 Coro::cede;
2913 last unless IO::AIO::nreqs || BDB::nreqs; 3645 while (IO::AIO::nreqs || BDB::nreqs) {
2914 warn "iterate..."; 3646 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2915 }
2916
2917 ++$RELOAD;
2918
2919 warn "cancelling all extension coros";
2920 $_->cancel for values %EXT_CORO;
2921 %EXT_CORO = ();
2922
2923 warn "removing commands";
2924 %COMMAND = ();
2925
2926 warn "removing ext/exti commands";
2927 %EXTCMD = ();
2928 %EXTICMD = ();
2929
2930 warn "unloading/nuking all extensions";
2931 for my $pkg (@EXTS) {
2932 warn "... unloading $pkg";
2933
2934 if (my $cb = $pkg->can ("unload")) {
2935 eval {
2936 $cb->($pkg);
2937 1
2938 } or warn "$pkg unloaded, but with errors: $@";
2939 } 3647 }
2940 3648
2941 warn "... nuking $pkg"; 3649 warn "cancelling all extension coros";
2942 Symbol::delete_package $pkg; 3650 $_->cancel for values %EXT_CORO;
2943 } 3651 %EXT_CORO = ();
2944 3652
2945 warn "unloading all perl modules loaded from $LIBDIR"; 3653 warn "removing commands";
2946 while (my ($k, $v) = each %INC) { 3654 %COMMAND = ();
2947 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2948 3655
3656 warn "removing ext/exti commands";
3657 %EXTCMD = ();
3658 %EXTICMD = ();
3659
3660 warn "unloading/nuking all extensions";
3661 for my $pkg (@EXTS) {
2949 warn "... unloading $k"; 3662 warn "... unloading $pkg";
2950 delete $INC{$k};
2951 3663
2952 $k =~ s/\.pm$//;
2953 $k =~ s/\//::/g;
2954
2955 if (my $cb = $k->can ("unload_module")) { 3664 if (my $cb = $pkg->can ("unload")) {
3665 eval {
2956 $cb->(); 3666 $cb->($pkg);
3667 1
3668 } or warn "$pkg unloaded, but with errors: $@";
3669 }
3670
3671 warn "... clearing $pkg";
3672 clear_package $pkg;
2957 } 3673 }
2958 3674
2959 Symbol::delete_package $k; 3675 warn "unloading all perl modules loaded from $LIBDIR";
3676 while (my ($k, $v) = each %INC) {
3677 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3678
3679 warn "... unloading $k";
3680 delete $INC{$k};
3681
3682 $k =~ s/\.pm$//;
3683 $k =~ s/\//::/g;
3684
3685 if (my $cb = $k->can ("unload_module")) {
3686 $cb->();
3687 }
3688
3689 clear_package $k;
2960 } 3690 }
2961 3691
2962 warn "getting rid of safe::, as good as possible"; 3692 warn "getting rid of safe::, as good as possible";
2963 Symbol::delete_package "safe::$_" 3693 clear_package "safe::$_"
2964 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2965 3695
2966 warn "unloading cf.pm \"a bit\""; 3696 warn "unloading cf.pm \"a bit\"";
2967 delete $INC{"cf.pm"}; 3697 delete $INC{"cf.pm"};
2968 delete $INC{"cf/pod.pm"}; 3698 delete $INC{"cf/pod.pm"};
2969 3699
2970 # don't, removes xs symbols, too, 3700 # don't, removes xs symbols, too,
2971 # and global variables created in xs 3701 # and global variables created in xs
2972 #Symbol::delete_package __PACKAGE__; 3702 #clear_package __PACKAGE__;
2973 3703
2974 warn "unload completed, starting to reload now"; 3704 warn "unload completed, starting to reload now";
2975 3705
2976 warn "reloading cf.pm"; 3706 warn "reloading cf.pm";
2977 require cf; 3707 require cf;
2978 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2979 3709
2980 warn "loading config and database again"; 3710 warn "loading config and database again";
2981 cf::cfg_load; 3711 cf::reload_config;
2982 3712
2983 warn "loading extensions"; 3713 warn "loading extensions";
2984 cf::load_extensions; 3714 cf::load_extensions;
2985 3715
3716 if ($REATTACH_ON_RELOAD) {
2986 warn "reattaching attachments to objects/players"; 3717 warn "reattaching attachments to objects/players";
2987 _global_reattach; # objects, sockets 3718 _global_reattach; # objects, sockets
2988 warn "reattaching attachments to maps"; 3719 warn "reattaching attachments to maps";
2989 reattach $_ for values %MAP; 3720 reattach $_ for values %MAP;
2990 warn "reattaching attachments to players"; 3721 warn "reattaching attachments to players";
2991 reattach $_ for values %PLAYER; 3722 reattach $_ for values %PLAYER;
3723 }
2992 3724
3725 warn "running post_init jobs";
3726 (pop @POST_INIT)->(1) while @POST_INIT;
3727
2993 warn "leaving sync_job"; 3728 warn "leaving sync_job";
2994 3729
2995 1 3730 1
2996 } or do { 3731 } or do {
2997 warn $@; 3732 warn $@;
2998 warn "error while reloading, exiting."; 3733 cf::cleanup "error while reloading, exiting.";
2999 exit 1;
3000 }; 3734 };
3001 3735
3002 warn "reloaded"; 3736 warn "reloaded";
3737 --$RELOAD;
3738 }
3739
3740 $t1 = EV::time - $t1;
3741 warn "reload completed in ${t1}s\n";
3003}; 3742};
3004 3743
3005our $RELOAD_WATCHER; # used only during reload 3744our $RELOAD_WATCHER; # used only during reload
3006 3745
3007sub reload_perl() { 3746sub reload_perl() {
3008 # doing reload synchronously and two reloads happen back-to-back, 3747 # doing reload synchronously and two reloads happen back-to-back,
3009 # coro crashes during coro_state_free->destroy here. 3748 # coro crashes during coro_state_free->destroy here.
3010 3749
3011 $RELOAD_WATCHER ||= Event->timer ( 3750 $RELOAD_WATCHER ||= cf::async {
3012 reentrant => 0, 3751 Coro::AIO::aio_wait cache_extensions;
3013 after => 0, 3752
3014 data => WF_AUTOCANCEL, 3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3015 cb => sub {
3016 do_reload_perl; 3754 do_reload_perl;
3017 undef $RELOAD_WATCHER; 3755 undef $RELOAD_WATCHER;
3018 }, 3756 };
3019 ); 3757 };
3020} 3758}
3021 3759
3022register_command "reload" => sub { 3760register_command "reload" => sub {
3023 my ($who, $arg) = @_; 3761 my ($who, $arg) = @_;
3024 3762
3025 if ($who->flag (FLAG_WIZ)) { 3763 if ($who->flag (FLAG_WIZ)) {
3026 $who->message ("reloading server."); 3764 $who->message ("reloading server.");
3765 async {
3766 $Coro::current->{desc} = "perl_reload";
3027 async { reload_perl }; 3767 reload_perl;
3768 };
3028 } 3769 }
3029}; 3770};
3030 3771
3031unshift @INC, $LIBDIR; 3772unshift @INC, $LIBDIR;
3032 3773
… …
3034 3775
3035our @WAIT_FOR_TICK; 3776our @WAIT_FOR_TICK;
3036our @WAIT_FOR_TICK_BEGIN; 3777our @WAIT_FOR_TICK_BEGIN;
3037 3778
3038sub wait_for_tick { 3779sub wait_for_tick {
3039 return unless $TICK_WATCHER->is_active;
3040 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
3041 3781
3042 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK, $signal; 3783 push @WAIT_FOR_TICK, $signal;
3044 $signal->wait; 3784 $signal->wait;
3045} 3785}
3046 3786
3047sub wait_for_tick_begin { 3787sub wait_for_tick_begin {
3048 return unless $TICK_WATCHER->is_active;
3049 return if $Coro::current == $Coro::main; 3788 return if tick_inhibit || $Coro::current == $Coro::main;
3050 3789
3051 my $signal = new Coro::Signal; 3790 my $signal = new Coro::Signal;
3052 push @WAIT_FOR_TICK_BEGIN, $signal; 3791 push @WAIT_FOR_TICK_BEGIN, $signal;
3053 $signal->wait; 3792 $signal->wait;
3054} 3793}
3055 3794
3056 my $min = 1e6;#d# 3795sub tick {
3057 my $avg = 10;
3058$TICK_WATCHER = Event->timer (
3059 reentrant => 0,
3060 parked => 1,
3061 prio => 0,
3062 at => $NEXT_TICK || $TICK,
3063 data => WF_AUTOCANCEL,
3064 cb => sub {
3065 if ($Coro::current != $Coro::main) { 3796 if ($Coro::current != $Coro::main) {
3066 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3797 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3067 unless ++$bug_warning > 10; 3798 unless ++$bug_warning > 10;
3068 return; 3799 return;
3069 } 3800 }
3070 3801
3071 $NOW = $tick_start = Event::time;
3072
3073 cf::server_tick; # one server iteration 3802 cf::server_tick; # one server iteration
3074 3803
3075 0 && sync_job {#d# 3804 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3076 for(1..10) { 3805 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3077 my $t = Event::time; 3806 Coro::async_pool {
3078 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3807 $Coro::current->{desc} = "runtime saver";
3079 or die; 3808 write_runtime_sync
3080 3809 or warn "ERROR: unable to write runtime file: $!";
3081 $map->width (50);
3082 $map->height (50);
3083 $map->alloc;
3084 $map->_load_objects ("/tmp/x.map", 1);
3085 my $t = Event::time - $t;
3086
3087 #next unless $t < 0.0013;#d#
3088 if ($t < $min) {
3089 $min = $t;
3090 }
3091 $avg = $avg * 0.99 + $t * 0.01;
3092 }
3093 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3094 exit 0;
3095 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3096 }; 3810 };
3811 }
3097 3812
3098 $RUNTIME += $TICK;
3099 $NEXT_TICK += $TICK;
3100
3101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3102 $NEXT_RUNTIME_WRITE = $NOW + 10;
3103 Coro::async_pool {
3104 write_runtime
3105 or warn "ERROR: unable to write runtime file: $!";
3106 };
3107 }
3108
3109# my $AFTER = Event::time;
3110# warn $AFTER - $NOW;#d#
3111
3112 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3813 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3113 $sig->send; 3814 $sig->send;
3114 } 3815 }
3115 while (my $sig = shift @WAIT_FOR_TICK) { 3816 while (my $sig = shift @WAIT_FOR_TICK) {
3116 $sig->send; 3817 $sig->send;
3117 } 3818 }
3118 3819
3119 $NOW = Event::time; 3820 $LOAD = ($NOW - $TICK_START) / $TICK;
3120
3121 # if we are delayed by four ticks or more, skip them all
3122 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3123
3124 $TICK_WATCHER->at ($NEXT_TICK);
3125 $TICK_WATCHER->start;
3126
3127 $LOAD = ($NOW - $tick_start) / $TICK;
3128 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3821 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3129 3822
3130 _post_tick; 3823 if (0) {
3131 3824 if ($NEXT_TICK) {
3132 3825 my $jitter = $TICK_START - $NEXT_TICK;
3826 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3827 warn "jitter $JITTER\n";#d#
3828 }
3133 }, 3829 }
3134); 3830}
3135 3831
3136{ 3832{
3137 BDB::max_poll_time $TICK * 0.1; 3833 # configure BDB
3138 $BDB_POLL_WATCHER = Event->io ( 3834
3139 reentrant => 0,
3140 fd => BDB::poll_fileno,
3141 poll => 'r',
3142 prio => 0,
3143 data => WF_AUTOCANCEL,
3144 cb => \&BDB::poll_cb,
3145 );
3146 BDB::min_parallel 8; 3835 BDB::min_parallel 8;
3147 3836 BDB::max_poll_reqs $TICK * 0.1;
3148 BDB::set_sync_prepare { 3837 $AnyEvent::BDB::WATCHER->priority (1);
3149 my $status;
3150 my $current = $Coro::current;
3151 (
3152 sub {
3153 $status = $!;
3154 $current->ready; undef $current;
3155 },
3156 sub {
3157 Coro::schedule while defined $current;
3158 $! = $status;
3159 },
3160 )
3161 };
3162 3838
3163 unless ($DB_ENV) { 3839 unless ($DB_ENV) {
3164 $DB_ENV = BDB::db_env_create; 3840 $DB_ENV = BDB::db_env_create;
3841 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3842 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3843 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3844 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3845 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3165 3846
3166 cf::sync_job { 3847 cf::sync_job {
3167 eval { 3848 eval {
3168 BDB::db_env_open 3849 BDB::db_env_open
3169 $DB_ENV, 3850 $DB_ENV,
… …
3171 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3852 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3172 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3853 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3173 0666; 3854 0666;
3174 3855
3175 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3856 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3176
3177 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3178 $DB_ENV->set_lk_detect;
3179 }; 3857 };
3180 3858
3181 cf::cleanup "db_env_open(db): $@" if $@; 3859 cf::cleanup "db_env_open(db): $@" if $@;
3182 }; 3860 };
3183 } 3861 }
3862
3863 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3864 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3865 };
3866 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3867 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3868 };
3869 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3870 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3871 };
3184} 3872}
3185 3873
3186{ 3874{
3875 # configure IO::AIO
3876
3187 IO::AIO::min_parallel 8; 3877 IO::AIO::min_parallel 8;
3188
3189 undef $Coro::AIO::WATCHER;
3190 IO::AIO::max_poll_time $TICK * 0.1; 3878 IO::AIO::max_poll_time $TICK * 0.1;
3191 $AIO_POLL_WATCHER = Event->io ( 3879 undef $AnyEvent::AIO::WATCHER;
3192 reentrant => 0,
3193 data => WF_AUTOCANCEL,
3194 fd => IO::AIO::poll_fileno,
3195 poll => 'r',
3196 prio => 6,
3197 cb => \&IO::AIO::poll_cb,
3198 );
3199} 3880}
3200 3881
3201my $_log_backtrace; 3882my $_log_backtrace;
3202 3883
3203sub _log_backtrace { 3884sub _log_backtrace {
… …
3206 $msg =~ s/\n//; 3887 $msg =~ s/\n//;
3207 3888
3208 # limit the # of concurrent backtraces 3889 # limit the # of concurrent backtraces
3209 if ($_log_backtrace < 2) { 3890 if ($_log_backtrace < 2) {
3210 ++$_log_backtrace; 3891 ++$_log_backtrace;
3892 my $perl_bt = Carp::longmess $msg;
3211 async { 3893 async {
3894 $Coro::current->{desc} = "abt $msg";
3895
3212 my @bt = fork_call { 3896 my @bt = fork_call {
3213 @addr = map { sprintf "%x", $_ } @addr; 3897 @addr = map { sprintf "%x", $_ } @addr;
3214 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3898 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3215 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3899 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3216 or die "addr2line: $!"; 3900 or die "addr2line: $!";
… …
3224 } 3908 }
3225 3909
3226 @funcs 3910 @funcs
3227 }; 3911 };
3228 3912
3229 LOG llevInfo, "[ABT] $msg\n"; 3913 LOG llevInfo, "[ABT] $perl_bt\n";
3914 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3230 LOG llevInfo, "[ABT] $_\n" for @bt; 3915 LOG llevInfo, "[ABT] $_\n" for @bt;
3231 --$_log_backtrace; 3916 --$_log_backtrace;
3232 }; 3917 };
3233 } else { 3918 } else {
3234 LOG llevInfo, "[ABT] $msg\n"; 3919 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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