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.434 by root, Thu May 29 03:27:37 2008 UTC vs.
Revision 1.477 by root, Wed Sep 2 22:52:36 2009 UTC

… …
19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict qw(vars subs);
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
37use Guard ();
36use Coro (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
… …
57use Compress::LZF; 61use Compress::LZF;
58use Digest::MD5 (); 62use Digest::MD5 ();
59 63
60AnyEvent::detect; 64AnyEvent::detect;
61 65
62IO::AIO::max_poll_reqs 1;#d#
63
64# configure various modules to our taste 66# configure various modules to our taste
65# 67#
66$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69 76
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 79
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 81
74our %COMMAND = (); 82our %COMMAND = ();
75our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 86our %EXTCMD = ();
79our %EXTICMD = (); 87our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
82 90
83our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 92our @EVENT;
85 93
86our $CONFDIR = confdir; 94our $CONFDIR = confdir;
87our $DATADIR = datadir; 95our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 97our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 98our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 99our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 100our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 102our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 103our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 104our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime";
107
97our %RESOURCE; 108our %RESOURCE;
98 109
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 112our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
103 114
104our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 118our $DB_ENV;
108 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
109our %CFG; 122our %CFG;
110 123
111our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 125our $RUNTIME;
113our $NOW; 126our $NOW;
… …
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 137our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
126 139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
144
127binmode STDOUT; 145binmode STDOUT;
128binmode STDERR; 146binmode STDERR;
129 147
130# read virtual server time, if available 148# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
135} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
136 156
137mkdir $_ 157mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 159
140our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
… …
202 222
203=back 223=back
204 224
205=cut 225=cut
206 226
207BEGIN { 227$Coro::State::WARNHOOK = sub {
208 *CORE::GLOBAL::warn = sub {
209 my $msg = join "", @_; 228 my $msg = join "", @_;
210 229
211 $msg .= "\n" 230 $msg .= "\n"
212 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
213 232
214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215 234
216 LOG llevError, $msg; 235 LOG llevError, $msg;
217 }; 236};
218}
219 237
220$Coro::State::DIEHOOK = sub { 238$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 239 return unless $^S eq 0; # "eq", not "=="
240
241 warn Carp::longmess $_[0];
222 242
223 if ($Coro::current == $Coro::main) {#d# 243 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 244 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 245 return;#d#
226 }#d# 246 }#d#
227 247
228 # kill coroutine otherwise 248 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 249 Coro::terminate
231}; 250};
232
233$SIG{__DIE__} = sub { }; #d#?
234 251
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 252@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 253@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 254@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 255@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
245for my $pkg (qw( 262for my $pkg (qw(
246 cf::global cf::attachable 263 cf::global cf::attachable
247 cf::object cf::object::player 264 cf::object cf::object::player
248 cf::client cf::player 265 cf::client cf::player
249 cf::arch cf::living 266 cf::arch cf::living
267 cf::map cf::mapspace
250 cf::map cf::party cf::region 268 cf::party cf::region
251)) { 269)) {
252 no strict 'refs';
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 271}
255 272
256$EV::DIED = sub { 273$EV::DIED = sub {
257 warn "error in event callback: @_"; 274 warn "error in event callback: @_";
… …
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 316our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 317
301sub encode_json($) { $json_coder->encode ($_[0]) } 318sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 319sub decode_json($) { $json_coder->decode ($_[0]) }
303 320
321=item cf::post_init { BLOCK }
322
323Execute the given codeblock, I<after> all extensions have been (re-)loaded,
324but I<before> the server starts ticking again.
325
326The cdoeblock will have a single boolean argument to indicate whether this
327is a reload or not.
328
329=cut
330
331sub post_init(&) {
332 push @POST_INIT, shift;
333}
334
304=item cf::lock_wait $string 335=item cf::lock_wait $string
305 336
306Wait until the given lock is available. See cf::lock_acquire. 337Wait until the given lock is available. See cf::lock_acquire.
307 338
308=item my $lock = cf::lock_acquire $string 339=item my $lock = cf::lock_acquire $string
309 340
310Wait until the given lock is available and then acquires it and returns 341Wait until the given lock is available and then acquires it and returns
311a Coro::guard object. If the guard object gets destroyed (goes out of scope, 342a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 343for example when the coroutine gets canceled), the lock is automatically
313returned. 344returned.
314 345
315Locks are *not* recursive, locking from the same coro twice results in a 346Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 347deadlocked coro.
… …
322 353
323Return true if the lock is currently active, i.e. somebody has locked it. 354Return true if the lock is currently active, i.e. somebody has locked it.
324 355
325=cut 356=cut
326 357
327our %LOCK; 358our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 359
330sub lock_wait($) { 360sub lock_wait($) {
331 my ($key) = @_; 361 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 362}
344 363
345sub lock_acquire($) { 364sub lock_acquire($) {
346 my ($key) = @_; 365 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 366}
360 367
361sub lock_active($) { 368sub lock_active($) {
362 my ($key) = @_; 369 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 370}
366 371
367sub freeze_mainloop { 372sub freeze_mainloop {
368 tick_inhibit_inc; 373 tick_inhibit_inc;
369 374
370 Coro::guard \&tick_inhibit_dec; 375 &Guard::guard (\&tick_inhibit_dec);
371} 376}
372 377
373=item cf::periodic $interval, $cb 378=item cf::periodic $interval, $cb
374 379
375Like EV::periodic, but randomly selects a starting point so that the actions 380Like EV::periodic, but randomly selects a starting point so that the actions
… …
727 732
728############################################################################# 733#############################################################################
729 734
730=head2 ATTACHABLE OBJECTS 735=head2 ATTACHABLE OBJECTS
731 736
732Many objects in crossfire are so-called attachable objects. That means you can 737Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 738attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 739to it. All such attachable objects support the following methods.
735 740
736In the following description, CLASS can be any of C<global>, C<object> 741In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 742C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
787=item cf::CLASS::attachment $name, ... 792=item cf::CLASS::attachment $name, ...
788 793
789Register an attachment by C<$name> through which attachable objects of the 794Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 795given CLASS can refer to this attachment.
791 796
792Some classes such as crossfire maps and objects can specify attachments 797Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 798that are attached at load/instantiate time, thus the need for a name.
794 799
795These calls expect any number of the following handler/hook descriptions: 800These calls expect any number of the following handler/hook descriptions:
796 801
797=over 4 802=over 4
… …
1088 1093
1089sub reattach { 1094sub reattach {
1090 # basically do the same as instantiate, without calling instantiate 1095 # basically do the same as instantiate, without calling instantiate
1091 my ($obj) = @_; 1096 my ($obj) = @_;
1092 1097
1098 # no longer needed after getting rid of delete_package?
1093 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1099 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1094 1100
1095 my $registry = $obj->registry; 1101 my $registry = $obj->registry;
1096 1102
1097 @$registry = (); 1103 @$registry = ();
1098 1104
… …
1146 $decname, length $$rdata, scalar @$objs; 1152 $decname, length $$rdata, scalar @$objs;
1147 1153
1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1149 aio_chmod $fh, SAVE_MODE; 1155 aio_chmod $fh, SAVE_MODE;
1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1151 aio_fsync $fh if $cf::USE_FSYNC; 1157 if ($cf::USE_FSYNC) {
1158 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1159 aio_fsync $fh;
1160 }
1152 aio_close $fh; 1161 aio_close $fh;
1153 1162
1154 if (@$objs) { 1163 if (@$objs) {
1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1164 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1165 aio_chmod $fh, SAVE_MODE;
1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1166 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1158 aio_write $fh, 0, (length $data), $data, 0; 1167 aio_write $fh, 0, (length $data), $data, 0;
1159 aio_fsync $fh if $cf::USE_FSYNC; 1168 if ($cf::USE_FSYNC) {
1169 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1170 aio_fsync $fh;
1171 }
1160 aio_close $fh; 1172 aio_close $fh;
1161 aio_rename "$filename.pst~", "$filename.pst"; 1173 aio_rename "$filename.pst~", "$filename.pst";
1162 } 1174 }
1163 } else { 1175 } else {
1164 aio_unlink "$filename.pst"; 1176 aio_unlink "$filename.pst";
1165 } 1177 }
1166 1178
1167 aio_rename "$filename~", $filename; 1179 aio_rename "$filename~", $filename;
1180
1181 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC;
1168 } else { 1183 } else {
1169 warn "FATAL: $filename~: $!\n"; 1184 warn "unable to save objects: $filename~: $!\n";
1170 } 1185 }
1171 } else { 1186 } else {
1172 aio_unlink $filename; 1187 aio_unlink $filename;
1173 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1174 } 1189 }
… …
1265 my ($name, $cb) = @_; 1280 my ($name, $cb) = @_;
1266 1281
1267 $EXTICMD{$name} = $cb; 1282 $EXTICMD{$name} = $cb;
1268} 1283}
1269 1284
1285use File::Glob ();
1286
1270cf::player->attach ( 1287cf::player->attach (
1271 on_command => sub { 1288 on_command => sub {
1272 my ($pl, $name, $params) = @_; 1289 my ($pl, $name, $params) = @_;
1273 1290
1274 my $cb = $COMMAND{$name} 1291 my $cb = $COMMAND{$name}
… …
1306 1323
1307 cf::override; 1324 cf::override;
1308 }, 1325 },
1309); 1326);
1310 1327
1328# "readahead" all extensions
1329sub cache_extensions {
1330 my $grp = IO::AIO::aio_group;
1331
1332 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1333 for (grep /\.ext$/, @{$_[0]}) {
1334 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1335 }
1336 };
1337
1338 $grp
1339}
1340
1311sub load_extensions { 1341sub load_extensions {
1312 cf::sync_job { 1342 cf::sync_job {
1313 my %todo; 1343 my %todo;
1314 1344
1315 for my $path (<$LIBDIR/*.ext>) { 1345 for my $path (<$LIBDIR/*.ext>) {
… …
1334 1364
1335 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1365 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1336 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1366 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1337 1367
1338 $ext{source} = 1368 $ext{source} =
1339 "package $pkg; use strict; use utf8;\n" 1369 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1340 . "#line 1 \"$path\"\n{\n" 1370 . "#line 1 \"$path\"\n{\n"
1341 . $source 1371 . $source
1342 . "\n};\n1"; 1372 . "\n};\n1";
1343 1373
1344 $todo{$base} = \%ext; 1374 $todo{$base} = \%ext;
… …
1384 1414
1385=back 1415=back
1386 1416
1387=head2 CORE EXTENSIONS 1417=head2 CORE EXTENSIONS
1388 1418
1389Functions and methods that extend core crossfire objects. 1419Functions and methods that extend core deliantra objects.
1390 1420
1391=cut 1421=cut
1392 1422
1393package cf::player; 1423package cf::player;
1394 1424
… …
1437 1467
1438sub exists($) { 1468sub exists($) {
1439 my ($login) = @_; 1469 my ($login) = @_;
1440 1470
1441 $cf::PLAYER{$login} 1471 $cf::PLAYER{$login}
1442 or cf::sync_job { !aio_stat path $login } 1472 or !aio_stat path $login
1443} 1473}
1444 1474
1445sub find($) { 1475sub find($) {
1446 return $cf::PLAYER{$_[0]} || do { 1476 return $cf::PLAYER{$_[0]} || do {
1447 my $login = $_[0]; 1477 my $login = $_[0];
… …
1522 my ($pl) = @_; 1552 my ($pl) = @_;
1523 1553
1524 my $name = $pl->ob->name; 1554 my $name = $pl->ob->name;
1525 1555
1526 $pl->{deny_save} = 1; 1556 $pl->{deny_save} = 1;
1527 $pl->password ("*"); # this should lock out the player until we nuked the dir 1557 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1528 1558
1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1530 $pl->deactivate; 1560 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1561 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score; 1562 $pl->ob->check_score;
… …
1618 } 1648 }
1619 1649
1620 \@paths 1650 \@paths
1621} 1651}
1622 1652
1623=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1653=item $protocol_xml = $player->expand_cfpod ($cfpod)
1624 1654
1625Expand crossfire pod fragments into protocol xml. 1655Expand deliantra pod fragments into protocol xml.
1626
1627=cut
1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1640sub expand_cfpod {
1641 my ($self, $pod) = @_;
1642
1643 my $xml;
1644
1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1648
1649 $group =~ s/&/&amp;/g;
1650 $group =~ s/</&lt;/g;
1651
1652 $xml .= $group;
1653 } elsif ($pod =~ m%\G
1654 ([BCGHITU])
1655 <
1656 (?:
1657 ([^<>]*) (?{ $group = $^N })
1658 | < $interior >
1659 )
1660 >
1661 %gcsx
1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1682 "")
1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1694
1695 for ($xml) {
1696 # create single paragraphs (very hackish)
1697 s/(?<=\S)\n(?=\w)/ /g;
1698
1699 # compress some whitespace
1700 s/\s+\n/\n/g; # ws line-ends
1701 s/\n\n+/\n/g; # double lines
1702 s/^\n+//; # beginning lines
1703 s/\n+$//; # ending lines
1704 }
1705
1706 $xml
1707}
1708
1709no re 'eval';
1710
1711sub hintmode {
1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1713 $_[0]{hintmode}
1714}
1715 1656
1716=item $player->ext_reply ($msgid, @msg) 1657=item $player->ext_reply ($msgid, @msg)
1717 1658
1718Sends an ext reply to the player. 1659Sends an ext reply to the player.
1719 1660
… …
1932 1873
1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1934 "$UNIQUEDIR/$path" 1875 "$UNIQUEDIR/$path"
1935} 1876}
1936 1877
1937# and all this just because we cannot iterate over
1938# all maps in C++...
1939sub change_all_map_light {
1940 my ($change) = @_;
1941
1942 $_->change_map_light ($change)
1943 for grep $_->outdoor, values %cf::MAP;
1944}
1945
1946sub decay_objects { 1878sub decay_objects {
1947 my ($self) = @_; 1879 my ($self) = @_;
1948 1880
1949 return if $self->{deny_reset}; 1881 return if $self->{deny_reset};
1950 1882
… …
2032sub find { 1964sub find {
2033 my ($path, $origin) = @_; 1965 my ($path, $origin) = @_;
2034 1966
2035 $path = normalise $path, $origin && $origin->path; 1967 $path = normalise $path, $origin && $origin->path;
2036 1968
2037 cf::lock_wait "map_data:$path";#d#remove 1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2038 cf::lock_wait "map_find:$path"; 1970 my $guard2 = cf::lock_acquire "map_find:$path";
2039 1971
2040 $cf::MAP{$path} || do { 1972 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
2044 my $map = new_from_path cf::map $path 1973 my $map = new_from_path cf::map $path
2045 or return; 1974 or return;
2046 1975
2047 $map->{last_save} = $cf::RUNTIME; 1976 $map->{last_save} = $cf::RUNTIME;
2048 1977
… …
2088 my $f = new_from_file cf::object::thawer $self->{load_path}; 2017 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block; 2018 $f->skip_block;
2090 $self->_load_objects ($f) 2019 $self->_load_objects ($f)
2091 or return; 2020 or return;
2092 2021
2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2022 $self->post_load_original
2094 if delete $self->{load_original}; 2023 if delete $self->{load_original};
2095 2024
2096 if (my $uniq = $self->uniq_path) { 2025 if (my $uniq = $self->uniq_path) {
2097 utf8::encode $uniq; 2026 utf8::encode $uniq;
2098 unless (aio_stat $uniq) { 2027 unless (aio_stat $uniq) {
… …
2115 2044
2116 unless ($self->{deny_activate}) { 2045 unless ($self->{deny_activate}) {
2117 $self->decay_objects; 2046 $self->decay_objects;
2118 $self->fix_auto_apply; 2047 $self->fix_auto_apply;
2119 $self->update_buttons; 2048 $self->update_buttons;
2120 cf::cede_to_tick;
2121 $self->set_darkness_map;
2122 cf::cede_to_tick; 2049 cf::cede_to_tick;
2123 $self->activate; 2050 $self->activate;
2124 } 2051 }
2125 2052
2126 $self->{last_save} = $cf::RUNTIME; 2053 $self->{last_save} = $cf::RUNTIME;
… …
2468 2395
2469our $SAY_CHANNEL = { 2396our $SAY_CHANNEL = {
2470 id => "say", 2397 id => "say",
2471 title => "Map", 2398 title => "Map",
2472 reply => "say ", 2399 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2400 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2474}; 2401};
2475 2402
2476our $CHAT_CHANNEL = { 2403our $CHAT_CHANNEL = {
2477 id => "chat", 2404 id => "chat",
2478 title => "Chat", 2405 title => "Chat",
… …
2533 2460
2534=item $player_object->enter_link 2461=item $player_object->enter_link
2535 2462
2536Freezes the player and moves him/her to a special map (C<{link}>). 2463Freezes the player and moves him/her to a special map (C<{link}>).
2537 2464
2538The player should be reasonably safe there for short amounts of time. You 2465The player should be reasonably safe there for short amounts of time (e.g.
2539I<MUST> call C<leave_link> as soon as possible, though. 2466for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link
2468map.
2540 2469
2541Will never block. 2470Will never block.
2542 2471
2543=item $player_object->leave_link ($map, $x, $y) 2472=item $player_object->leave_link ($map, $x, $y)
2544 2473
… …
2602 2531
2603 $map->load; 2532 $map->load;
2604 $map->load_neighbours; 2533 $map->load_neighbours;
2605 2534
2606 return unless $self->contr->active; 2535 return unless $self->contr->active;
2607 $self->activate_recursive;
2608 2536
2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2610 $self->enter_map ($map, $x, $y); 2538 $self->enter_map ($map, $x, $y);
2539
2540 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive;
2611} 2542}
2612 2543
2613=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2614 2545
2615Moves the player to the given map-path and coordinates by first freezing 2546Moves the player to the given map-path and coordinates by first freezing
2616her, loading and preparing them map, calling the provided $check callback 2547her, loading and preparing them map, calling the provided $check callback
2617that has to return the map if sucecssful, and then unfreezes the player on 2548that has to return the map if sucecssful, and then unfreezes the player on
2618the new (success) or old (failed) map position. In either case, $done will 2549the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process. 2550be called at the end of this process.
2551
2552Note that $check will be called with a potentially non-loaded map, so if
2553it needs a loaded map it has to call C<< ->load >>.
2620 2554
2621=cut 2555=cut
2622 2556
2623our $GOTOGEN; 2557our $GOTOGEN;
2624 2558
… …
2771 $self->contr->savebed ($map, $x, $y) 2705 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 2706 if $exit->flag (cf::FLAG_DAMNED);
2773 2707
2774 1 2708 1
2775 }) { 2709 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 2710 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "I'll try to bring you back to the map you were before. " 2711 . "I'll try to bring you back to the map you were before. "
2778 . "Please report this to the dungeon master!", 2712 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 2713 cf::NDI_UNIQUE | cf::NDI_RED);
2780 2714
2781 warn "ERROR in enter_exit: $@"; 2715 warn "ERROR in enter_exit: $@";
… …
2847 id => "infobox", 2781 id => "infobox",
2848 title => "Body Parts", 2782 title => "Body Parts",
2849 reply => undef, 2783 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available", 2784 tooltip => "Shows which body parts you posess and are available",
2851 }, 2785 },
2786 "c/statistics" => {
2787 id => "infobox",
2788 title => "Statistics",
2789 reply => undef,
2790 tooltip => "Shows your primary statistics",
2791 },
2792 "c/skills" => {
2793 id => "infobox",
2794 title => "Skills",
2795 reply => undef,
2796 tooltip => "Shows your experience per skill and item power",
2797 },
2798 "c/shopitems" => {
2799 id => "infobox",
2800 title => "Shop Items",
2801 reply => undef,
2802 tooltip => "Shows the items currently for sale in this shop",
2803 },
2804 "c/resistances" => {
2805 id => "infobox",
2806 title => "Resistances",
2807 reply => undef,
2808 tooltip => "Shows your resistances",
2809 },
2810 "c/pets" => {
2811 id => "infobox",
2812 title => "Pets",
2813 reply => undef,
2814 tooltip => "Shows information abotu your pets/a specific pet",
2815 },
2816 "c/perceiveself" => {
2817 id => "infobox",
2818 title => "Perceive Self",
2819 reply => undef,
2820 tooltip => "You gained detailed knowledge about yourself",
2821 },
2852 "c/uptime" => { 2822 "c/uptime" => {
2853 id => "infobox", 2823 id => "infobox",
2854 title => "Uptime", 2824 title => "Uptime",
2855 reply => undef, 2825 reply => undef,
2856 tooltip => "How long the server has been running since last restart", 2826 tooltip => "How long the server has been running since last restart",
… …
2865 id => "party", 2835 id => "party",
2866 title => "Party", 2836 title => "Party",
2867 reply => "gsay ", 2837 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party", 2838 tooltip => "Messages and chat related to your party",
2869 }, 2839 },
2840 "c/death" => {
2841 id => "death",
2842 title => "Death",
2843 reply => undef,
2844 tooltip => "Reason for and more info about your most recent death",
2845 },
2846 "c/say" => $SAY_CHANNEL,
2847 "c/chat" => $CHAT_CHANNEL,
2870); 2848);
2871 2849
2872sub cf::client::send_msg { 2850sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 2851 my ($self, $channel, $msg, $color, @extra) = @_;
2874 2852
2875 $msg = $self->pl->expand_cfpod ($msg); 2853 $msg = $self->pl->expand_cfpod ($msg)
2854 unless $color & cf::NDI_VERBATIM;
2876 2855
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 2856 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 2857
2879 # check predefined channels, for the benefit of C 2858 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 2859 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel}; 2860 $channel = $CHANNEL{$channel};
2882 2861
2883 $self->ext_msg (channel_info => $channel) 2862 $self->ext_msg (channel_info => $channel);
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id}; 2863 $channel = $channel->{id};
2887 2864
2888 } elsif (ref $channel) { 2865 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent 2866 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) { 2867 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel; 2868 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel) 2869 $self->ext_msg (channel_info => $channel);
2893 if $self->can_msg;
2894 } 2870 }
2895 2871
2896 $channel = $channel->{id}; 2872 $channel = $channel->{id};
2897 } 2873 }
2898 2874
2899 return unless @extra || length $msg; 2875 return unless @extra || length $msg;
2900 2876
2901 if ($self->can_msg) {
2902 # default colour, mask it out 2877 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 2879 if $color & cf::NDI_DEF;
2905 2880
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2881 my $pkt = "msg "
2882 . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2908 } else { 2884 );
2909 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones
2911 for ($msg) {
2912 1 while
2913 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2914 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2915 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2916 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2917 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2918 }
2919 2885
2920 $color &= cf::NDI_COLOR_MASK; 2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2921 2889
2922 utf8::encode $msg; 2890 # split very large packets
2923 2891 if (8192 < length $pkt and $self->{can_lzf}) {
2924 if (0 && $msg =~ /\[/) { 2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2925 # COMMAND/INFO 2893 $pkt = "frag";
2926 $self->send_packet ("drawextinfo $color 10 8 $msg")
2927 } else {
2928 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2929 $self->send_packet ("drawinfo $color $msg")
2930 }
2931 }
2932 } 2894 }
2895
2896 $self->send_packet ($pkt);
2933} 2897}
2934 2898
2935=item $client->ext_msg ($type, @msg) 2899=item $client->ext_msg ($type, @msg)
2936 2900
2937Sends an ext event to the client. 2901Sends an ext event to the client.
… …
3112The following functions and methods are available within a safe environment: 3076The following functions and methods are available within a safe environment:
3113 3077
3114 cf::object 3078 cf::object
3115 contr pay_amount pay_player map x y force_find force_add destroy 3079 contr pay_amount pay_player map x y force_find force_add destroy
3116 insert remove name archname title slaying race decrease split 3080 insert remove name archname title slaying race decrease split
3081 value
3117 3082
3118 cf::object::player 3083 cf::object::player
3119 player 3084 player
3120 3085
3121 cf::player 3086 cf::player
… …
3127=cut 3092=cut
3128 3093
3129for ( 3094for (
3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3131 insert remove inv nrof name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3097 decrease split destroy change_exp value msg lore send_msg)],
3133 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful send_msg)],
3135 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
3136) { 3101) {
3137 no strict 'refs'; 3102 no strict 'refs';
3138 my ($pkg, @funs) = @$_; 3103 my ($pkg, @funs) = @$_;
3139 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3156 my ($code, %vars) = @_; 3121 my ($code, %vars) = @_;
3157 3122
3158 my $qcode = $code; 3123 my $qcode = $code;
3159 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3160 $qcode =~ s/\n/\\n/g; 3125 $qcode =~ s/\n/\\n/g;
3126
3127 %vars = (_dummy => 0) unless %vars;
3161 3128
3162 local $_; 3129 local $_;
3163 local @safe::cf::_safe_eval_args = values %vars; 3130 local @safe::cf::_safe_eval_args = values %vars;
3164 3131
3165 my $eval = 3132 my $eval =
… …
3395 reload_treasures; 3362 reload_treasures;
3396 3363
3397 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
3398} 3365}
3399 3366
3400sub init {
3401 my $guard = freeze_mainloop;
3402
3403 reload_resources;
3404}
3405
3406sub reload_config { 3367sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3368 open my $fh, "<:utf8", "$CONFDIR/config"
3408 or return; 3369 or return;
3409 3370
3410 local $/; 3371 local $/;
… …
3422 }; 3383 };
3423 warn $@ if $@; 3384 warn $@ if $@;
3424 } 3385 }
3425} 3386}
3426 3387
3388sub pidfile() {
3389 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3390 or die "$PIDFILE: $!";
3391 flock $fh, &Fcntl::LOCK_EX
3392 or die "$PIDFILE: flock: $!";
3393 $fh
3394}
3395
3396# make sure only one server instance is running at any one time
3397sub atomic {
3398 my $fh = pidfile;
3399
3400 my $pid = <$fh>;
3401 kill 9, $pid if $pid > 0;
3402
3403 seek $fh, 0, 0;
3404 print $fh $$;
3405}
3406
3407sub main_loop {
3408 warn "EV::loop starting\n";
3409 if (1) {
3410 EV::loop;
3411 }
3412 warn "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP;
3414}
3415
3427sub main { 3416sub main {
3417 cf::init_globals; # initialise logging
3418
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428
3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3430
3428 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3434 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3436 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3435 }; 3438 };
3436 3439
3437 { 3440 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3441
3442 cf::sync_job {
3443 reload_resources;
3439 reload_config; 3444 reload_config;
3440 db_init; 3445 db_init;
3446
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid;
3450 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills;
3453
3454 cf::init_beforeplay;
3455
3456 atomic;
3457
3441 load_extensions; 3458 load_extensions;
3442 3459
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3460 utime time, time, $RUNTIMEFILE;
3461
3462 # no (long-running) fork's whatsoever before this point(!)
3463 use POSIX ();
3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3465
3466 (pop @POST_INIT)->(0) while @POST_INIT;
3444 } 3467 };
3445 3468
3446 EV::loop; 3469 main_loop;
3447} 3470}
3448 3471
3449############################################################################# 3472#############################################################################
3450# initialisation and cleanup 3473# initialisation and cleanup
3451 3474
… …
3458 }; 3481 };
3459 } 3482 }
3460} 3483}
3461 3484
3462sub write_runtime_sync { 3485sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime";
3464
3465 # first touch the runtime file to show we are still running: 3486 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3487 # the fsync below can take a very very long time.
3467 3488
3468 IO::AIO::aio_utime $runtime, undef, undef; 3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3490
3470 my $guard = cf::lock_acquire "write_runtime"; 3491 my $guard = cf::lock_acquire "write_runtime";
3471 3492
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3473 or return; 3494 or return;
3474 3495
3475 my $value = $cf::RUNTIME + 90 + 10; 3496 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3497 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3498 # 60 allows for the watchdog to kill the server.
… …
3487 aio_utime $fh, undef, undef; 3508 aio_utime $fh, undef, undef;
3488 3509
3489 close $fh 3510 close $fh
3490 or return; 3511 or return;
3491 3512
3492 aio_rename "$runtime~", $runtime 3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3514 and return;
3494 3515
3495 warn "runtime file written.\n"; 3516 warn "runtime file written.\n";
3496 3517
3497 1 3518 1
… …
3509 my $uuid = "$LOCALDIR/uuid"; 3530 my $uuid = "$LOCALDIR/uuid";
3510 3531
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3532 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3533 or return;
3513 3534
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3535 my $value = uuid_seq uuid_cur;
3536
3537 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n";
3539 return;
3540 }
3541
3542 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3543 $uuid_skip = 0;
3516 3544
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3545 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3546 and return;
3519 3547
… …
3541} 3569}
3542 3570
3543sub emergency_save() { 3571sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3572 my $freeze_guard = cf::freeze_mainloop;
3545 3573
3546 warn "enter emergency perl save\n"; 3574 warn "emergency_perl_save: enter\n";
3547 3575
3548 cf::sync_job { 3576 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so
3578 # save all maps without fsync, and later call a global sync
3579 # (which in turn might be very very slow)
3580 local $USE_FSYNC = 0;
3581
3549 # use a peculiar iteration method to avoid tripping on perl 3582 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3583 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3584 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3585 warn "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3586 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3587 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3588 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3590 $pl->save;
3558 } 3591 }
3559 warn "end emergency player save\n"; 3592 warn "emergency_perl_save: end player save\n";
3560 3593
3561 warn "begin emergency map save\n"; 3594 warn "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3595 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3596 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3597 $map->valid or next;
3565 $map->save; 3598 $map->save;
3566 } 3599 }
3567 warn "end emergency map save\n"; 3600 warn "emergency_perl_save: end map save\n";
3568 3601
3569 warn "begin emergency database checkpoint\n"; 3602 warn "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3604 warn "emergency_perl_save: end database checkpoint\n";
3572 3605
3573 warn "begin write uuid\n"; 3606 warn "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3607 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3608 warn "emergency_perl_save: end write uuid\n";
3576 }; 3609 };
3577 3610
3611 warn "emergency_perl_save: starting sync()\n";
3612 IO::AIO::aio_sync sub {
3613 warn "emergency_perl_save: finished sync()\n";
3614 };
3615
3578 warn "leave emergency perl save\n"; 3616 warn "emergency_perl_save: leave\n";
3579} 3617}
3580 3618
3581sub post_cleanup { 3619sub post_cleanup {
3582 my ($make_core) = @_; 3620 my ($make_core) = @_;
3583 3621
3584 warn Carp::longmess "post_cleanup backtrace" 3622 warn Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3623 if $make_core;
3624
3625 my $fh = pidfile;
3626 unlink $PIDFILE if <$fh> == $$;
3627}
3628
3629# a safer delete_package, copied from Symbol
3630sub clear_package($) {
3631 my $pkg = shift;
3632
3633 # expand to full symbol table name if needed
3634 unless ($pkg =~ /^main::.*::$/) {
3635 $pkg = "main$pkg" if $pkg =~ /^::/;
3636 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3637 $pkg .= '::' unless $pkg =~ /::$/;
3638 }
3639
3640 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3641 my $stem_symtab = *{$stem}{HASH};
3642
3643 defined $stem_symtab and exists $stem_symtab->{$leaf}
3644 or return;
3645
3646 # clear all symbols
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 }
3652 warn "cleared package $pkg\n";#d#
3586} 3653}
3587 3654
3588sub do_reload_perl() { 3655sub do_reload_perl() {
3589 # can/must only be called in main 3656 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3657 if ($Coro::current != $Coro::main) {
3591 warn "can only reload from main coroutine"; 3658 warn "can only reload from main coroutine";
3592 return; 3659 return;
3593 } 3660 }
3594 3661
3662 return if $RELOAD++;
3663
3664 my $t1 = EV::time;
3665
3666 while ($RELOAD) {
3595 warn "reloading..."; 3667 warn "reloading...";
3596 3668
3597 warn "entering sync_job"; 3669 warn "entering sync_job";
3598 3670
3599 cf::sync_job { 3671 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3672 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3673 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3674 cf::write_runtime_sync; # external watchdog should not bark
3603 3675
3604 warn "syncing database to disk"; 3676 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3677 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3678
3607 # if anything goes wrong in here, we should simply crash as we already saved 3679 # if anything goes wrong in here, we should simply crash as we already saved
3608 3680
3609 warn "flushing outstanding aio requests"; 3681 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs; 3682 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3683 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = ();
3623
3624 warn "removing commands";
3625 %COMMAND = ();
3626
3627 warn "removing ext/exti commands";
3628 %EXTCMD = ();
3629 %EXTICMD = ();
3630
3631 warn "unloading/nuking all extensions";
3632 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg";
3634
3635 if (my $cb = $pkg->can ("unload")) {
3636 eval {
3637 $cb->($pkg);
3638 1
3639 } or warn "$pkg unloaded, but with errors: $@";
3640 } 3684 }
3641 3685
3642 warn "... nuking $pkg"; 3686 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3687 $_->cancel for values %EXT_CORO;
3644 } 3688 %EXT_CORO = ();
3645 3689
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3690 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3691 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3692
3693 warn "removing ext/exti commands";
3694 %EXTCMD = ();
3695 %EXTICMD = ();
3696
3697 warn "unloading/nuking all extensions";
3698 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3699 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3700
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3701 if (my $cb = $pkg->can ("unload")) {
3702 eval {
3657 $cb->(); 3703 $cb->($pkg);
3704 1
3705 } or warn "$pkg unloaded, but with errors: $@";
3706 }
3707
3708 warn "... clearing $pkg";
3709 clear_package $pkg;
3658 } 3710 }
3659 3711
3660 Symbol::delete_package $k; 3712 warn "unloading all perl modules loaded from $LIBDIR";
3713 while (my ($k, $v) = each %INC) {
3714 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715
3716 warn "... unloading $k";
3717 delete $INC{$k};
3718
3719 $k =~ s/\.pm$//;
3720 $k =~ s/\//::/g;
3721
3722 if (my $cb = $k->can ("unload_module")) {
3723 $cb->();
3724 }
3725
3726 clear_package $k;
3661 } 3727 }
3662 3728
3663 warn "getting rid of safe::, as good as possible"; 3729 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3730 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3731 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3732
3667 warn "unloading cf.pm \"a bit\""; 3733 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3734 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3736
3671 # don't, removes xs symbols, too, 3737 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3738 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3739 #clear_package __PACKAGE__;
3674 3740
3675 warn "unload completed, starting to reload now"; 3741 warn "unload completed, starting to reload now";
3676 3742
3677 warn "reloading cf.pm"; 3743 warn "reloading cf.pm";
3678 require cf; 3744 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3680 3746
3681 warn "loading config and database again"; 3747 warn "loading config and database again";
3682 cf::reload_config; 3748 cf::reload_config;
3683 3749
3684 warn "loading extensions"; 3750 warn "loading extensions";
3685 cf::load_extensions; 3751 cf::load_extensions;
3686 3752
3753 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3754 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3755 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3756 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3757 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3758 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3759 reattach $_ for values %PLAYER;
3760 }
3693 3761
3762 warn "running post_init jobs";
3763 (pop @POST_INIT)->(1) while @POST_INIT;
3764
3694 warn "leaving sync_job"; 3765 warn "leaving sync_job";
3695 3766
3696 1 3767 1
3697 } or do { 3768 } or do {
3698 warn $@; 3769 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3770 cf::cleanup "error while reloading, exiting.";
3700 }; 3771 };
3701 3772
3702 warn "reloaded"; 3773 warn "reloaded";
3774 --$RELOAD;
3775 }
3776
3777 $t1 = EV::time - $t1;
3778 warn "reload completed in ${t1}s\n";
3703}; 3779};
3704 3780
3705our $RELOAD_WATCHER; # used only during reload 3781our $RELOAD_WATCHER; # used only during reload
3706 3782
3707sub reload_perl() { 3783sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3784 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3785 # coro crashes during coro_state_free->destroy here.
3710 3786
3787 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions;
3789
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3791 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3792 undef $RELOAD_WATCHER;
3793 };
3714 }; 3794 };
3715} 3795}
3716 3796
3717register_command "reload" => sub { 3797register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3798 my ($who, $arg) = @_;
… …
3793 BDB::max_poll_reqs $TICK * 0.1; 3873 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3874 $AnyEvent::BDB::WATCHER->priority (1);
3795 3875
3796 unless ($DB_ENV) { 3876 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3877 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3878 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 3879 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3880 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3881 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3882 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 3883
3803 cf::sync_job { 3884 cf::sync_job {
3804 eval { 3885 eval {
… …
3830{ 3911{
3831 # configure IO::AIO 3912 # configure IO::AIO
3832 3913
3833 IO::AIO::min_parallel 8; 3914 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 3915 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 3916 undef $AnyEvent::AIO::WATCHER;
3836} 3917}
3837 3918
3838my $_log_backtrace; 3919my $_log_backtrace;
3839 3920
3840sub _log_backtrace { 3921sub _log_backtrace {
… …
3843 $msg =~ s/\n//; 3924 $msg =~ s/\n//;
3844 3925
3845 # limit the # of concurrent backtraces 3926 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 3927 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 3928 ++$_log_backtrace;
3929 my $perl_bt = Carp::longmess $msg;
3848 async { 3930 async {
3849 $Coro::current->{desc} = "abt $msg"; 3931 $Coro::current->{desc} = "abt $msg";
3850 3932
3851 my @bt = fork_call { 3933 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 3934 @addr = map { sprintf "%x", $_ } @addr;
… …
3863 } 3945 }
3864 3946
3865 @funcs 3947 @funcs
3866 }; 3948 };
3867 3949
3868 LOG llevInfo, "[ABT] $msg\n"; 3950 LOG llevInfo, "[ABT] $perl_bt\n";
3951 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 3952 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 3953 --$_log_backtrace;
3871 }; 3954 };
3872 } else { 3955 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 3956 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 3957 LOG llevInfo, "[ABT] [suppressed]\n";
3875 } 3958 }
3876} 3959}
3877 3960
3878# load additional modules 3961# load additional modules
3879use cf::pod; 3962require "cf/$_.pm" for @EXTRA_MODULES;
3880 3963
3881END { cf::emergency_save } 3964END { cf::emergency_save }
3882 3965
3883evthread_start IO::AIO::poll_fileno;
3884
38851 39661
3886 3967

Diff Legend

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