aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2010-12-20Merge branch 'pan/werl-scrollwheel/OTP-8985' into devPatrik Nyblom
* pan/werl-scrollwheel/OTP-8985: Teach win_con.c about scroll wheels
2010-12-20Merge branch 'egil/fix-gitignore-vim' into devBjörn-Egil Dahlberg
* egil/fix-gitignore-vim: Fix .gitignore
2010-12-17Merge branch 'maint-r14' into devNiclas Eklund
2010-12-17Merge branch 'maint-r13' into maint-r14Niclas Eklund
Conflicts: lib/orber/doc/src/notes.xml lib/orber/vsn.mk
2010-12-17Merge branch 'raimo/getifaddrs_ifa_addr_NULL/OTP-8996' into devRaimo Niskanen
* raimo/getifaddrs_ifa_addr_NULL/OTP-8996: Fix segfault for NULL return value fields from getifaddrs()
2010-12-17Merge branch 'rickard/exit/2-refc/OTP-9005' into devRickard Green
* rickard/exit/2-refc/OTP-9005: Decrement refc after unlock in exit/2
2010-12-17Decrement refc after unlock in exit/2Rickard Green
2010-12-17Fix missed change of aux_work typeRickard Green
2010-12-17Merge branch 'rickard/fix-warnings/R14B02' into devRickard Green
* rickard/fix-warnings/R14B02: Remove unused variable Remove stray semicolons in erl_term.h
2010-12-17Merge branch 'rickard/ets-no-write-refc/OTP-9000' into devRickard Green
* rickard/ets-no-write-refc/OTP-9000: Stop using reference counter when write accessing ETS-tables Conflicts: erts/emulator/beam/erl_db.c
2010-12-17Merge branch 'rickard/ets-tab-delete/OTP-8999' into devRickard Green
* rickard/ets-tab-delete/OTP-8999: Safe deallocation of ETS-table structures Fix rwlock resource leak when hitting system limit Conflicts: erts/emulator/beam/erl_process.h erts/emulator/beam/erl_process.c
2010-12-17Merge branch 'bmk/inets/httpd_hrl_file_install/OTP-8988' into devIngela Anderton Andin
* bmk/inets/httpd_hrl_file_install/OTP-8988: External include files
2010-12-17Merge branch 'ia/ssl/cover-clean' into devIngela Anderton Andin
* ia/ssl/cover-clean: Cleaned up meaningless code discovered thanks to cover
2010-12-17Cleaned up meaningless code discovered thanks to coverIngela Anderton Andin
2010-12-16External include filesMicael Karlberg
HTTPD header file install "fixed". That is, the include files in the include dir are installed in the include dir (by the Makefile in the src/inets_app). New wrapper header files (with the same names httpd.hrl and mod_auth.hrl) has been created in the src/http_server dir (which in turn is installed in the src/http_server dir by the Makefile in the src/http_server dir).
2010-12-16Merge branch 'nick/orber/old_ssl_option/OTP-8994' into maint-r14Erlang/OTP
* nick/orber/old_ssl_option/OTP-8994: The SSL option {ssl_imp, old} was not used if ssl_generation was set to 2. Only R14B was affected by this. Conflicts: lib/orber/doc/src/notes.xml lib/orber/vsn.mk
2010-12-16Merge branch 'nick/orber/recursive_types/OTP-8868' into maint-r14Erlang/OTP
* nick/orber/recursive_types/OTP-8868: Support for recursive unions and structs. Break loop if recursive TypeCode. Added basic tests for recursive uinions and structs. Removed test code. Added partial support for recursive IDL types. Conflicts: lib/ic/doc/src/notes.xml lib/ic/vsn.mk lib/orber/vsn.mk
2010-12-16Merge branch 'rickard/atomic-type/OTP-8974' into devRickard Green
* rickard/atomic-type/OTP-8974: Unbreak atomic fallback
2010-12-16Unbreak atomic fallbackRickard Green
2010-12-16Merge branch 'rickard/atomic-type/OTP-8974' into devRickard Green
* rickard/atomic-type/OTP-8974: Use 32-bit atomics for system block Use 32-bit atomics for misc scheduling specific information Use 32-bit atomic for uaflgs in thread specific events Use 32-bit atomics for process lock flags Add 32-bit atomics to emulator APIs Use new atomic types in emulator Use 32-bit atomics for ethr_thr_create Use 32-bit atomics for mutex and rwmutex flags Use 32-bit atomics for events Add support for 32-bit atomics Move atomic API into own files Add support for 64-bit atomics on Windows Remove unused ethread time functionality Introduce ethr_sint_t and use it for atomics
2010-12-16Use 32-bit atomics for system blockRickard Green
2010-12-16Use 32-bit atomics for misc scheduling specific informationRickard Green
2010-12-16Use 32-bit atomic for uaflgs in thread specific eventsRickard Green
2010-12-16Use 32-bit atomics for process lock flagsRickard Green
2010-12-16Add 32-bit atomics to emulator APIsRickard Green
2010-12-16Stop using reference counter when write accessing ETS-tablesRickard Green
2010-12-16Safe deallocation of ETS-table structuresRickard Green
Ensure that all threads potentially accessing an ETS-table have dropped all references to the table before deallocating it.
2010-12-16Fix rwlock resource leak when hitting system limitRickard Green
2010-12-15Remove unused variableRickard Green
2010-12-15Remove stray semicolons in erl_term.hRickard Green
2010-12-15Use new atomic types in emulatorRickard Green
2010-12-15Use 32-bit atomics for ethr_thr_createRickard Green
2010-12-15Use 32-bit atomics for mutex and rwmutex flagsRickard Green
2010-12-15Use 32-bit atomics for eventsRickard Green
2010-12-15Add support for 32-bit atomicsRickard Green
2010-12-15Merge branch 'egil/fix-distribution-testcase' into devBjörn-Egil Dahlberg
* egil/fix-distribution-testcase: kernel: fix faulty distribution testcase
2010-12-15kernel: fix faulty distribution testcaseBjörn-Egil Dahlberg
2010-12-15Fix .gitignoreBjörn-Egil Dahlberg
Ignore vim tmp-files
2010-12-14Merge branch 'nick/orber/old_ssl_option/OTP-8994' into maint-r13Erlang/OTP
* nick/orber/old_ssl_option/OTP-8994: The SSL option {ssl_imp, old} was not used if ssl_generation was set to 2. Only R14B was affected by this. Conflicts: lib/orber/doc/src/notes.xml lib/orber/vsn.mk
2010-12-14Merge branch 'nick/orber/recursive_types/OTP-8868' into maint-r13Erlang/OTP
* nick/orber/recursive_types/OTP-8868: Support for recursive unions and structs. Break loop if recursive TypeCode. Added basic tests for recursive uinions and structs. Removed test code. Added partial support for recursive IDL types.
2010-12-14Move atomic API into own filesRickard Green
2010-12-14Add support for 64-bit atomics on WindowsRickard Green
2010-12-14Remove unused ethread time functionalityRickard Green
2010-12-14Support for recursive unions and structs. Break loop if recursive TypeCode.Niclas Eklund
2010-12-14Fix segfault for NULL return value fields from getifaddrs()Raimo Niskanen
2010-12-11Introduce ethr_sint_t and use it for atomicsRickard Green
The atomic memory operations interface used the 'long' type and assumed that it was of the same size as 'void *'. This is true on most platforms, however, not on Windows 64.
2010-12-10Merge branch 'maint-r13' of super:otp into nick/orber/recursive_types/OTP-8868Niclas Eklund
2010-12-10The SSL option {ssl_imp, old} was not used if ssl_generation was set to 2. ↵Niclas Eklund
Only R14B was affected by this.
2010-12-10Fix a couple typos in filename encoding docsTuncer Ayaz
2010-12-09Teach win_con.c about scroll wheelsPatrik Nyblom